Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 7909ebe

Browse files
committed
chore: run more browsers on Travis (IE8,IE9,IE10,Safari,FF)
Also instead of running everything in parallel, there are only two parallel tasks: - e2e tests running in the background (only on Chrome) - all the unit tests running sequentially
1 parent 1d06a94 commit 7909ebe

File tree

5 files changed

+47
-16
lines changed

5 files changed

+47
-16
lines changed

Gruntfile.js

+2-9
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,9 @@ module.exports = function(grunt) {
2727

2828
parallel: {
2929
travis: {
30-
options: {
31-
stream: true
32-
},
3330
tasks: [
34-
{grunt: true, args: ['test:docgen']},
35-
util.parallelTask('tests:docs'),
36-
util.parallelTask('tests:modules'),
37-
util.parallelTask('tests:jquery'),
38-
util.parallelTask('tests:jqlite'),
39-
util.parallelTask('test:e2e')
31+
util.parallelTask(['test:unit', 'test:docgen', 'tests:docs'], {stream: true}),
32+
util.parallelTask(['test:e2e'])
4033
]
4134
}
4235
},

karma-shared.conf.js

+28
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,34 @@ module.exports = function(config) {
1818
'SL_Chrome': {
1919
base: 'SauceLabs',
2020
browserName: 'chrome'
21+
},
22+
'SL_Firefox': {
23+
base: 'SauceLabs',
24+
browserName: 'firefox'
25+
},
26+
'SL_Safari': {
27+
base: 'SauceLabs',
28+
browserName: 'safari',
29+
platform: 'Mac 10.8',
30+
version: '6'
31+
},
32+
'SL_IE_8': {
33+
base: 'SauceLabs',
34+
browserName: 'internet explorer',
35+
platform: 'Windows 7',
36+
version: '8'
37+
},
38+
'SL_IE_9': {
39+
base: 'SauceLabs',
40+
browserName: 'internet explorer',
41+
platform: 'Windows 2008',
42+
version: '9'
43+
},
44+
'SL_IE_10': {
45+
base: 'SauceLabs',
46+
browserName: 'internet explorer',
47+
platform: 'Windows 2012',
48+
version: '10'
2149
}
2250
}
2351
});

lib/grunt/utils.js

+12-5
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,18 @@ module.exports = {
246246
};
247247
},
248248

249-
parallelTask: function(name) {
250-
var args = [name, '--port=' + this.lastParallelTaskPort];
249+
parallelTask: function(args, options) {
250+
var task = {
251+
grunt: true,
252+
args: args,
253+
stream: options && options.stream
254+
};
255+
256+
args.push('--port=' + this.lastParallelTaskPort);
251257

252-
if (grunt.option('browsers')) {
258+
if (args.indexOf('test:e2e') !== -1 && grunt.option('e2e-browsers')) {
259+
args.push('--browsers=' + grunt.option('e2e-browsers'));
260+
} else if (grunt.option('browsers')) {
253261
args.push('--browsers=' + grunt.option('browsers'));
254262
}
255263

@@ -259,8 +267,7 @@ module.exports = {
259267

260268
this.lastParallelTaskPort++;
261269

262-
263-
return {grunt: true, args: args};
270+
return task;
264271
},
265272

266273
lastParallelTaskPort: 9876

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"marked": "~0.2.9",
3232
"rewire": "1.1.3",
3333
"grunt-contrib-jasmine-node": "~0.1.1",
34-
"grunt-parallel": "~0.3.0",
34+
"grunt-parallel": "git://github.com/vojtajina/grunt-parallel.git#streaming-per-task",
3535
"grunt-ddescribe-iit": "~0.0.1",
3636
"grunt-merge-conflict": "~0.0.1"
3737
},

travis_build.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@ export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
77
npm install -g grunt-cli
88
grunt ci-checks package
99
./lib/sauce/sauce_connect_block.sh
10-
grunt parallel:travis --reporters dots --browsers SL_Chrome
10+
11+
grunt parallel:travis --reporters dots \
12+
--browsers SL_Chrome,SL_Firefox,SL_Safari,SL_IE_8,SL_IE_9,SL_IE_10 \
13+
--e2e-browsers SL_Chrome

0 commit comments

Comments
 (0)