Skip to content

Commit b7595e1

Browse files
committed
Fix webdriver tests
1 parent 281e6bb commit b7595e1

File tree

3 files changed

+81
-280
lines changed

3 files changed

+81
-280
lines changed

Gruntfile.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ module.exports = function(grunt) {
3737
base: './',
3838
keepalive: true
3939
}
40+
},
41+
ci: {
42+
options: {
43+
port: 8080,
44+
base: './',
45+
keepalive: false
46+
}
4047
}
4148
},
4249
uglify: {
@@ -65,7 +72,7 @@ module.exports = function(grunt) {
6572
if (arguments.length) {
6673
selenium[arg1].apply(null, arguments);
6774
} else {
68-
selenium.tests();
75+
selenium.tests().onValue(done);
6976
}
7077
});
7178

@@ -81,6 +88,6 @@ module.exports = function(grunt) {
8188
grunt.registerTask('server', ['connect']);
8289
grunt.registerTask('build', ['concat', 'uglify']);
8390
grunt.registerTask('default', ['jshint', 'concat', 'qunit', 'uglify']);
84-
grunt.registerTask('travis', ['jshint', 'concat','qunit', 'uglify', 'webdriver']);
91+
grunt.registerTask('travis', ['jshint', 'concat','qunit', 'uglify', 'connect:ci', 'webdriver']);
8592

8693
};

package.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,9 @@
2626
"grunt-contrib-jshint": "*",
2727
"grunt-contrib-qunit": "*",
2828
"grunt-contrib-watch": "~0.5.1",
29-
"googleapis": "~0.4.3",
30-
"jwt-sign": "~0.1.0",
3129
"base64-arraybuffer": ">= 0.1.0",
3230
"png-js": ">= 0.1.1",
33-
"sync-webdriver": ">=0.1.1",
34-
"express": "~3.2.3",
35-
"baconjs": "~0.3.15",
31+
"baconjs": "0.7.11",
3632
"wd": "~0.2.7",
3733
"grunt-contrib-connect": "~0.6.0"
3834
},

0 commit comments

Comments
 (0)