mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-03-16 23:30:23 +00:00
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
This commit is contained in:
parent
1d06a94385
commit
7909ebedc2
5 changed files with 47 additions and 16 deletions
11
Gruntfile.js
11
Gruntfile.js
|
|
@ -27,16 +27,9 @@ module.exports = function(grunt) {
|
|||
|
||||
parallel: {
|
||||
travis: {
|
||||
options: {
|
||||
stream: true
|
||||
},
|
||||
tasks: [
|
||||
{grunt: true, args: ['test:docgen']},
|
||||
util.parallelTask('tests:docs'),
|
||||
util.parallelTask('tests:modules'),
|
||||
util.parallelTask('tests:jquery'),
|
||||
util.parallelTask('tests:jqlite'),
|
||||
util.parallelTask('test:e2e')
|
||||
util.parallelTask(['test:unit', 'test:docgen', 'tests:docs'], {stream: true}),
|
||||
util.parallelTask(['test:e2e'])
|
||||
]
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -18,6 +18,34 @@ module.exports = function(config) {
|
|||
'SL_Chrome': {
|
||||
base: 'SauceLabs',
|
||||
browserName: 'chrome'
|
||||
},
|
||||
'SL_Firefox': {
|
||||
base: 'SauceLabs',
|
||||
browserName: 'firefox'
|
||||
},
|
||||
'SL_Safari': {
|
||||
base: 'SauceLabs',
|
||||
browserName: 'safari',
|
||||
platform: 'Mac 10.8',
|
||||
version: '6'
|
||||
},
|
||||
'SL_IE_8': {
|
||||
base: 'SauceLabs',
|
||||
browserName: 'internet explorer',
|
||||
platform: 'Windows 7',
|
||||
version: '8'
|
||||
},
|
||||
'SL_IE_9': {
|
||||
base: 'SauceLabs',
|
||||
browserName: 'internet explorer',
|
||||
platform: 'Windows 2008',
|
||||
version: '9'
|
||||
},
|
||||
'SL_IE_10': {
|
||||
base: 'SauceLabs',
|
||||
browserName: 'internet explorer',
|
||||
platform: 'Windows 2012',
|
||||
version: '10'
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -246,10 +246,18 @@ module.exports = {
|
|||
};
|
||||
},
|
||||
|
||||
parallelTask: function(name) {
|
||||
var args = [name, '--port=' + this.lastParallelTaskPort];
|
||||
parallelTask: function(args, options) {
|
||||
var task = {
|
||||
grunt: true,
|
||||
args: args,
|
||||
stream: options && options.stream
|
||||
};
|
||||
|
||||
if (grunt.option('browsers')) {
|
||||
args.push('--port=' + this.lastParallelTaskPort);
|
||||
|
||||
if (args.indexOf('test:e2e') !== -1 && grunt.option('e2e-browsers')) {
|
||||
args.push('--browsers=' + grunt.option('e2e-browsers'));
|
||||
} else if (grunt.option('browsers')) {
|
||||
args.push('--browsers=' + grunt.option('browsers'));
|
||||
}
|
||||
|
||||
|
|
@ -259,8 +267,7 @@ module.exports = {
|
|||
|
||||
this.lastParallelTaskPort++;
|
||||
|
||||
|
||||
return {grunt: true, args: args};
|
||||
return task;
|
||||
},
|
||||
|
||||
lastParallelTaskPort: 9876
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
"marked": "~0.2.9",
|
||||
"rewire": "1.1.3",
|
||||
"grunt-contrib-jasmine-node": "~0.1.1",
|
||||
"grunt-parallel": "~0.3.0",
|
||||
"grunt-parallel": "git://github.com/vojtajina/grunt-parallel.git#streaming-per-task",
|
||||
"grunt-ddescribe-iit": "~0.0.1",
|
||||
"grunt-merge-conflict": "~0.0.1"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -7,4 +7,7 @@ export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
|
|||
npm install -g grunt-cli
|
||||
grunt ci-checks package
|
||||
./lib/sauce/sauce_connect_block.sh
|
||||
grunt parallel:travis --reporters dots --browsers SL_Chrome
|
||||
|
||||
grunt parallel:travis --reporters dots \
|
||||
--browsers SL_Chrome,SL_Firefox,SL_Safari,SL_IE_8,SL_IE_9,SL_IE_10 \
|
||||
--e2e-browsers SL_Chrome
|
||||
|
|
|
|||
Loading…
Reference in a new issue