diff --git a/.travis.yml b/.travis.yml index 6d58b61e3..1bbb4c82e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ script: # Karma sauce is limited to running about 5-7 browsers (or it will tiemout) at a time so we just run vendor by vendor here - "karma start karma.conf-sauce.js --browsers FIREFOX_V4,FIREFOX_V11,FIREFOX_V20,FIREFOX_V30,FIREFOX_V35" - "karma start karma.conf-sauce.js --browsers CHROME_V28,CHROME_V35,CHROME_V40,ANDROID_V4.0,ANDROID_V4.3" - - "karma start karma.conf-sauce.js --browsers INTERNET_EXPLORER_V9,INTERNET_EXPLORER_V10,INTERNET_EXPLORER_V11" + - "karma start karma.conf-sauce.js --browsers INTERNET_EXPLORER_V7,INTERNET_EXPLORER_V8,INTERNET_EXPLORER_V9,INTERNET_EXPLORER_V10,INTERNET_EXPLORER_V11" - "karma start karma.conf-sauce.js --browsers SAFARI_V5,SAFARI_V6,SAFARI_V7" - "karma start karma.conf-sauce.js --browsers OPERA_V11,OPERA_V12" notifications: diff --git a/karma.conf-sauce.js b/karma.conf-sauce.js index 5233e5cbb..7bd029173 100644 --- a/karma.conf-sauce.js +++ b/karma.conf-sauce.js @@ -15,9 +15,8 @@ var sauceBrowsers = _.reduce([ ['internet explorer', '11', 'Windows 8.1'], ['internet explorer', '10', 'Windows 8'], ['internet explorer', '9', 'Windows 7'], - // Currently do not work with Karma. - // ['internet explorer', '8', 'Windows 7'], - // ['internet explorer', '7', 'Windows XP'], + ['internet explorer', '8'], + ['internet explorer', '7', 'Windows XP'], // ['internet explorer', '6', 'Windows XP'], ['opera', '12'], @@ -27,8 +26,8 @@ var sauceBrowsers = _.reduce([ ['android', '4.0'], ['safari', '8'], - ['safari', '6'], ['safari', '7'], + ['safari', '6'], ['safari', '5'] ], function(memo, platform) { var label = (platform[0] + '_v' + platform[1]).replace(' ', '_').toUpperCase(); @@ -53,7 +52,7 @@ module.exports = function(config) { singleRun: true, // list of files / patterns to load in the browser - files: [ + files: [ 'test/vendor/jquery.js', 'test/vendor/json2.js', 'test/vendor/underscore.js', @@ -61,7 +60,7 @@ module.exports = function(config) { 'test/setup/*.js', 'test/*.js' ], - + // test results reporter to use reporters: ['dots', 'saucelabs'], port: 9876,