diff --git a/Gruntfile.js b/Gruntfile.js index a9157c9a8b..6446e0e51a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -144,6 +144,24 @@ module.exports = function(grunt) { saucelabs: { browsers: ['chrome_sl', 'ipad_sl'] }, + chrome_sl: { + browsers: ['chrome_sl'] + }, + firefox_sl: { + browsers: ['firefox_sl'] + }, + safari_sl: { + browsers: ['safari_sl'] + }, + ipad_sl: { + browsers: ['ipad_sl'] + }, + android_sl: { + browsers: ['android_sl'] + }, + ie_sl: { + browsers: ['ie_sl'] + }, // these are run locally on local browsers dev: { @@ -336,7 +354,14 @@ module.exports = function(grunt) { if (process.env.TRAVIS_PULL_REQUEST !== 'false') { grunt.task.run(['karma:phantomjs', 'karma:minified_phantomjs', 'karma:minified_api_phantomjs']); } else if (process.env.TRAVIS) { - grunt.task.run(['karma:saucelabs']); + grunt.task.run([ + 'karma:chrome_sl', + 'karma:firefox_sl', + 'karma:safari_sl', + 'karma:ipad_sl', + 'karma:android_sl', + 'karma:ie_sl' + ]); } else { // if we aren't running this in a CI, but running it manually, we can // supply arguments to this task. These arguments are either colon (`:`) @@ -368,7 +393,6 @@ module.exports = function(grunt) { return 'karma:' + task; }); - grunt.task.run(tasks); } }); diff --git a/test/karma.conf.js b/test/karma.conf.js index 6afa473f37..f4d7cf65ed 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -4,7 +4,7 @@ module.exports = function(config) { singleRun: true, base: 'SauceLabs', browserName: 'chrome', - platform: 'Windows 7', + platform: 'Windows 8.1', version: '34' }, @@ -12,7 +12,8 @@ module.exports = function(config) { singleRun: true, base: 'SauceLabs', browserName: 'firefox', - platform: 'Windows 8' + platform: 'Linux', + version: '29' }, safari_sl: { @@ -35,6 +36,14 @@ module.exports = function(config) { base: 'SauceLabs', browserName: 'android', platform:'Linux' + }, + + ie_sl: { + singleRun: true, + base: 'SauceLabs', + browserName: 'internet explorer', + platform: 'Windows 8.1', + version: '11' } };