From 02548a4bee41b31e53fe2a000813dac1233801ef Mon Sep 17 00:00:00 2001
From: Graeme Yeates <yeatesgraeme@gmail.com>
Date: Thu, 22 Oct 2015 10:01:28 -0400
Subject: [PATCH 1/3] Use karma concurrency for initiating parallel sauce tests

---
 .travis.yml         | 5 +----
 karma.conf-sauce.js | 3 +++
 package.json        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9153e6c..d339cbd8 100644
--- a/.travis.yml
+++ b/.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
diff --git a/karma.conf-sauce.js b/karma.conf-sauce.js
index 110461ba..4ad0176d 100644
--- a/karma.conf-sauce.js
+++ b/karma.conf-sauce.js
@@ -70,6 +70,9 @@ module.exports = function(config) {
         'test/*.js'
     ],
 
+    // Number of sauce tests to start in parallel
+    concurrency: 5,
+
     // test results reporter to use
     reporters: ['dots', 'saucelabs'],
     port: 9876,
diff --git a/package.json b/package.json
index 4788d390..e3c4ae66 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {
     "coffee-script": "1.7.1",
     "docco": "0.7.0",
-    "karma": "^0.12.31",
+    "karma": "^0.13.12",
     "karma-phantomjs-launcher": "^0.1.4",
     "karma-qunit": "^0.1.5",
     "qunitjs": "^1.18.0",

From b3d206756a4f356b2d9ec88d7eb8bdfd010d9415 Mon Sep 17 00:00:00 2001
From: Graeme Yeates <yeatesgraeme@gmail.com>
Date: Thu, 22 Oct 2015 11:22:43 -0400
Subject: [PATCH 2/3] Update sauce browser matrix

---
 karma.conf-sauce.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/karma.conf-sauce.js b/karma.conf-sauce.js
index 4ad0176d..260dc17c 100644
--- a/karma.conf-sauce.js
+++ b/karma.conf-sauce.js
@@ -13,7 +13,7 @@ var sauceBrowsers = _.reduce([
   ['chrome', '31'],
   ['chrome', '26'],
 
-  ['microsoftedge', '20.10240', 'Windows 10'],
+  ['microsoftedge', '20', 'Windows 10'],
   ['internet explorer', '11', 'Windows 10'],
   ['internet explorer', '10', 'Windows 8'],
   ['internet explorer', '9', 'Windows 7'],
@@ -26,7 +26,10 @@ var sauceBrowsers = _.reduce([
 
   ['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'],
@@ -71,7 +74,7 @@ module.exports = function(config) {
     ],
 
     // Number of sauce tests to start in parallel
-    concurrency: 5,
+    concurrency: 9,
 
     // test results reporter to use
     reporters: ['dots', 'saucelabs'],

From 1274cc2f2dc771de56fc7c8715ed7fadea0e766b Mon Sep 17 00:00:00 2001
From: Graeme Yeates <yeatesgraeme@gmail.com>
Date: Thu, 22 Oct 2015 12:31:15 -0400
Subject: [PATCH 3/3] Bump karma requirement to 0.13.13 karma-runner/karma#1653

---
 karma.conf-sauce.js | 7 ++++---
 package.json        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/karma.conf-sauce.js b/karma.conf-sauce.js
index 260dc17c..79d010cf 100644
--- a/karma.conf-sauce.js
+++ b/karma.conf-sauce.js
@@ -13,13 +13,14 @@ var sauceBrowsers = _.reduce([
   ['chrome', '31'],
   ['chrome', '26'],
 
-  ['microsoftedge', '20', 'Windows 10'],
+  ['microsoftedge', '20.10240', 'Windows 10'],
   ['internet explorer', '11', 'Windows 10'],
   ['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'],
diff --git a/package.json b/package.json
index e3c4ae66..85a91cff 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {
     "coffee-script": "1.7.1",
     "docco": "0.7.0",
-    "karma": "^0.13.12",
+    "karma": "^0.13.13",
     "karma-phantomjs-launcher": "^0.1.4",
     "karma-qunit": "^0.1.5",
     "qunitjs": "^1.18.0",