Update the sauce configuration

kebot · Mar 16, 2015 · a5cb5fb · a5cb5fb
1 parent 81813c8
commit a5cb5fb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,13 +11,12 @@ before_script:
 script:
   - npm test
   # 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_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
+  - karma start karma.conf-sauce.js --browsers FIREFOX_V4,FIREFOX_V11,FIREFOX_V21,FIREFOX_V30,FIREFOX_V35,CHROME_V26,CHROME_V31,CHROME_V39,CHROME_V40,ANDROID_V4.0,ANDROID_V4.3
+  - karma start karma.conf-sauce.js --browsers IE_V7,IE_V8,IE_V9,IE_V10,IE_V11
+  - karma start karma.conf-sauce.js --browsers SAFARI_V5,SAFARI_V6,SAFARI_V7,SAFARI_V8.0,OPERA_V11,OPERA_V12
 notifications:
   email: false
+sudo: false
 env:
   global:
   - secure: G9oDQUXytNHni0wasGDXO3lQE/xuP9gd6VZ20kuh5FzVlqfY5L7JfYWki435nZ1z2yPD1QVAZi+1BCmCwnkTLVO9gB7cmDJDt1VzeHdCSOqCXGDAbOcq67/OO4FUa77sCQSDnqOOGVbiUPldaDl8G6uylk72Ll8b0pPwUWdRCM8=

diff --git a/karma.conf-sauce.js b/karma.conf-sauce.js
@@ -4,13 +4,14 @@ var _ = require('underscore');
 var sauceBrowsers = _.reduce([
   ['firefox', '35'],
   ['firefox', '30'],
-  ['firefox', '20'],
+  ['firefox', '21'],
   ['firefox', '11'],
   ['firefox', '4'],
 
   ['chrome', '40'],
-  ['chrome', '35'],
-  ['chrome', '28'],
+  ['chrome', '39'],
+  ['chrome', '31'],
+  ['chrome', '26'],
 
   ['internet explorer', '11', 'Windows 8.1'],
   ['internet explorer', '10', 'Windows 8'],
@@ -22,15 +23,22 @@ var sauceBrowsers = _.reduce([
   ['opera', '12'],
   ['opera', '11'],
 
+  ['android', '5'],
+  ['android', '4.4'],
   ['android', '4.3'],
   ['android', '4.0'],
 
-  ['safari', '8'],
+  ['safari', '8.0', 'OS X 10.10'],
   ['safari', '7'],
   ['safari', '6'],
   ['safari', '5']
 ], function(memo, platform) {
-  var label = (platform[0] + '_v' + platform[1]).replace(' ', '_').toUpperCase();
+  // internet explorer -> ie
+  var label = platform[0].split(' ');
+  if (label.length > 1) {
+    label = _.invoke(label, 'charAt', 0)
+  }
+  label = (label.join("") + '_v' + platform[1]).replace(' ', '_').toUpperCase();
   memo[label] = _.pick({
     'base': 'SauceLabs',
     'browserName': platform[0],
@@ -73,10 +81,10 @@ module.exports = function(config) {
     },
 
     captureTimeout: 120000,
-    customLaunchers: sauceBrowsers
+    customLaunchers: sauceBrowsers,
 
     // Browsers to launch, commented out to prevent karma from starting
     // too many concurrent browsers and timing sauce out.
-    // browsers: _.keys(sauceBrowsers)
+    browsers: _.keys(sauceBrowsers)
   });
 };