Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit e6012c8

Browse files
committed
Merge pull request #5486 from adobe/dangoor/fix-travis
Turn off jasmine-node temporarily
2 parents 0e12072 + 433e1a0 commit e6012c8

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Gruntfile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,14 @@ module.exports = function (grunt) {
152152
grunt.loadNpmTasks('grunt-contrib-jasmine');
153153
grunt.loadNpmTasks('grunt-contrib-jshint');
154154
grunt.loadNpmTasks('grunt-contrib-watch');
155-
grunt.loadNpmTasks('grunt-contrib-jasmine-node');
155+
grunt.loadNpmTasks('grunt-jasmine-node');
156156

157157
// task: install
158158
grunt.registerTask('install', ['write-config']);
159159

160160
// task: test
161-
// grunt.registerTask('test', ['jshint:all', 'jasmine']);
162-
grunt.registerTask('test', ['jshint:all', 'jasmine', 'jasmine-node']);
161+
grunt.registerTask('test', ['jshint:all', 'jasmine']);
162+
// grunt.registerTask('test', ['jshint:all', 'jasmine', 'jasmine-node']);
163163

164164
// task: set-sprint
165165
// Update sprint number in package.json and rewrite src/config.json

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"devDependencies": {
1616
"grunt": "0.4.1",
1717
"jasmine-node": "1.9.1",
18-
"grunt-contrib-jasmine-node": "0.1.0",
18+
"grunt-jasmine-node": "0.1.0",
1919
"grunt-cli": "0.1.6",
2020
"phantomjs": "1.9.0-1",
2121
"grunt-lib-phantomjs": "0.3.0",

src/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"devDependencies": {
3434
"grunt": "0.4.1",
3535
"jasmine-node": "1.9.1",
36-
"grunt-contrib-jasmine-node": "0.1.0",
36+
"grunt-jasmine-node": "0.1.0",
3737
"grunt-cli": "0.1.6",
3838
"phantomjs": "1.9.0-1",
3939
"grunt-lib-phantomjs": "0.3.0",

0 commit comments

Comments
 (0)