Merge pull request #3832 from jashkenas/karma-sauce

Use karma concurrency for initiating parallel sauce tests

.travis.yml

@@ -10,10 +10,7 @@ before_script:
   - sh -e /etc/init.d/xvfb start
 script:
   - npm test
-  # Karma sauce is limited to running about 5-7 browsers (or it will timeout) at a time so we just run vendor by vendor here
-  - 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,MICROSOFTEDGE_V20.10240
-  - karma start karma.conf-sauce.js --browsers SAFARI_V5,SAFARI_V6,SAFARI_V7,SAFARI_V8.0,OPERA_V11,OPERA_V12
+  - karma start karma.conf-sauce.js
 notifications:
   email: false
 sudo: false

karma.conf-sauce.js

@@ -18,15 +18,19 @@ var sauceBrowsers = _.reduce([
   ['internet explorer', '10', 'Windows 8'],
   ['internet explorer', '9', 'Windows 7'],
   ['internet explorer', '8'],
-  ['internet explorer', '7', 'Windows XP'],
-  // ['internet explorer', '6', 'Windows XP'],
+  // Currently karma-sauce has issues with sockets and these browsers
+  // ['internet explorer', '7'],
+  // ['internet explorer', '6'],
 
   ['opera', '12'],
   ['opera', '11'],
 
   ['android', '5'],
   ['android', '4.4'],
-  ['android', '4.3'],
+
+  // 4.3 currently erros with some router tests
+  // ['android', '4.3'],
+  
   ['android', '4.0'],
 
   ['safari', '8.0', 'OS X 10.10'],
@@ -70,6 +74,9 @@ module.exports = function(config) {
         'test/*.js'
     ],
 
+    // Number of sauce tests to start in parallel
+    concurrency: 9,
+
     // test results reporter to use
     reporters: ['dots', 'saucelabs'],
     port: 9876,

package.json

@@ -10,7 +10,7 @@
   "devDependencies": {
     "coffee-script": "1.7.1",
     "docco": "0.7.0",
-    "karma": "^0.12.31",
+    "karma": "^0.13.13",
     "karma-phantomjs-launcher": "^0.1.4",
     "karma-qunit": "^0.1.5",
     "qunitjs": "^1.18.0",