travis fixes

.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 language: node_js
+addons:
+  sauce_connect: true
 cache:
   directories:
     - node_modules
@@ -13,5 +15,3 @@ env:
     - secure: FrYUC29lE/AVVP1Ac9Nyn/1gt6f1ulPkEUQ7n232JGOccrpnbWvFuwGjrTydt3O7nXNaHGl7dp2phq1W/pio2TdQX2VuJzk3wny3f5XnjIth/gg07zZMAnXV+wMHjR1XO3IK2Av5t3iFQdTQwguGd5JhmDQWM9F004AVkMn3Fsk=
     - secure: ZbCcFJx20CIE+6zzEQ6/lBW3u3FtKvNh8Y4lqAKHdxuotYCYT8ouuQJ3VU0xRHG2us5BxJ7U8hMrGGhB7l47X68H98nNVbHDF5RTTEdV4gCLNicwUpgseAXSL8z0W1lvCe0R30ZcdSWC+IqbtoQB7S450VyIQ7rlN9dIfO2M9yI=
     - secure: Xyd6Y/Iis6y2G1eUD6128Wt+XPwq88CYbLqHCYH7bBtn+4DXbQfZwyRorRMbgJa3czDohGwHYTawaxDy4abM5yvLuFD4WV2hwL/bvgl0Z3+krJ+ZVwGbNS/5UHJIytIuGH6MfLrYky2mzYwpOU6f34z93Yv+lfugwajH1dFwyKk=
-addons:
-  sauce_connect: true

karma.conf.js

@@ -9,7 +9,7 @@ module.exports = function(config) {
       browserName: 'Chrome',
     },
   };
-  config.set({
+  const configuration = {
     basePath: '',
     browsers: localBrowsers,
     frameworks: ['mocha', 'chai', 'sinon'],
@@ -32,16 +32,19 @@ module.exports = function(config) {
     browserNoActivityTimeout: timeout,
     singleRun: false,
     concurrency: Infinity
-  });
+  };
   if (process.env.SAUCE_ACCESS_KEY && process.env.SAUCE_USERNAME) {
     console.log('Using SAUCELABS');
-    config.reporters.push('saucelabs');
-    config.set({
-      customLaunchers: sauceLabsBrowsers,
-      browsers: Object.keys(sauceLabsBrowsers),
-      sauceLabs: {
-        testName: require('./package').name,
-      },
-    });
+    configuration.reporters.push('saucelabs');
+    configuration.customLaunchers = sauceLabsBrowsers;
+    configuration.browsers = Object.keys(sauceLabsBrowsers);
+    configuration.sauceLabs = {
+      testName: require('./package').name,
+    };
+  }
+  if ('TRAVIS' in process.env) {
+    configuration.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
+    configuration.sauceLabs.startConnect = false;
   }
+  config.set(configuration);
 }