upgrade karma; closes #2338 (#2339)

- reorg `karma.conf.js` a little - ensure local SauceLabs tests run
mochajs · Jun 29, 2016 · 96d9e06 · 96d9e06
1 parent aa8ff21
commit 96d9e06
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 47 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,50 +1,5 @@
 'use strict';
 
-function addSauceTests(cfg) {
-  cfg.reporters.push('saucelabs');
-  cfg.customLaunchers = {
-    ie8: {
-      base: 'SauceLabs',
-      browserName: 'internet explorer',
-      platform: 'Windows 7',
-      version: '8.0'
-    },
-    chrome: {
-      base: 'SauceLabs',
-      browserName: 'chrome',
-      platform: 'Windows 8',
-      version: 'latest'
-    },
-    edge: {
-      base: 'SauceLabs',
-      browserName: 'MicrosoftEdge',
-      platform: 'Windows 10',
-      version: 'latest'
-    },
-    firefox: {
-      base: 'SauceLabs',
-      browserName: 'firefox',
-      platform: 'Windows 8.1',
-      version: 'latest'
-    },
-    safari: {
-      base: 'SauceLabs',
-      browserName: 'safari',
-      platform: 'OS X 10.11',
-      version: 'latest'
-    }
-  };
-
-  cfg.browsers = cfg.browsers.concat(Object.keys(cfg.customLaunchers));
-
-  cfg.sauceLabs = {
-    public: 'public'
-  };
-
-  // for slow browser booting, ostensibly
-  cfg.captureTimeout = 120000;
-}
-
 module.exports = function(config) {
   var cfg = {
     frameworks: [
@@ -96,7 +51,6 @@ module.exports = function(config) {
         cfg.sauceLabs.build = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER
           + ' (' + process.env.TRAVIS_BUILD_ID + ')';
         cfg.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
-        cfg.sauceLabs.startConnect = true;
       }
     } else {
       if (!(process.env.SAUCE_USERNAME || process.env.SAUCE_ACCESS_KEY)) {
@@ -129,3 +83,51 @@ module.exports = function(config) {
 
   config.set(cfg);
 };
+
+function addSauceTests(cfg) {
+  cfg.reporters.push('saucelabs');
+
+  cfg.customLaunchers = {
+    ie8: {
+      base: 'SauceLabs',
+      browserName: 'internet explorer',
+      platform: 'Windows 7',
+      version: '8.0'
+    },
+    chrome: {
+      base: 'SauceLabs',
+      browserName: 'chrome',
+      platform: 'Windows 8',
+      version: 'latest'
+    },
+    edge: {
+      base: 'SauceLabs',
+      browserName: 'MicrosoftEdge',
+      platform: 'Windows 10',
+      version: 'latest'
+    },
+    firefox: {
+      base: 'SauceLabs',
+      browserName: 'firefox',
+      platform: 'Windows 8.1',
+      version: 'latest'
+    },
+    safari: {
+      base: 'SauceLabs',
+      browserName: 'safari',
+      platform: 'OS X 10.11',
+      version: 'latest'
+    }
+  };
+
+  cfg.browsers = cfg.browsers.concat(Object.keys(cfg.customLaunchers));
+
+  cfg.sauceLabs = {
+    public: 'public',
+    startConnect: true
+  };
+
+  // for slow browser booting, ostensibly
+  cfg.captureTimeout = 120000;
+  cfg.browserNoActivityTimeout = 20000;
+}
diff --git a/package.json b/package.json
@@ -333,7 +333,7 @@
     "coffee-script": "~1.8.0",
     "eslint": "^1.2.1",
     "expect.js": "^0.3.1",
-    "karma": "^0.13.22",
+    "karma": "^1.1.0",
     "karma-browserify": "^5.0.5",
     "karma-expect": "^1.1.2",
     "karma-no-mocha": "^2.0.0",