From 7615723547d156be1c0419b7f5a4639f6c1fa137 Mon Sep 17 00:00:00 2001
From: Vojta Jina
Date: Tue, 3 Dec 2013 16:07:13 -0800
Subject: chore: make it simpler to run tests on SL/BS during local development

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

diff --git a/karma-shared.conf.js b/karma-shared.conf.js
index 22c6759a..f4b8cf93 100644
--- a/karma-shared.conf.js
+++ b/karma-shared.conf.js
@@ -9,19 +9,17 @@ module.exports = function(config, specificOptions) {
     browserDisconnectTolerance: 2,
 
 
-    // config for Travis CI
+    // SauceLabs config for local development.
     sauceLabs: {
       testName: specificOptions.testName || 'AngularJS',
-      startConnect: false,
-      tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER
+      startConnect: true
     },
 
-    // BrowserStack config for Travis CI
+    // BrowserStack config for local development.
     browserStack: {
-      startTunnel: false,
       project: 'AngularJS',
       name: specificOptions.testName,
-      build: process.env.TRAVIS_BUILD_NUMBER,
+      startTunnel: true,
       timeout: 600 // 10min
     },
 
@@ -122,8 +120,13 @@ module.exports = function(config, specificOptions) {
 
     config.logLevel = config.LOG_DEBUG;
     config.transports = ['websocket', 'xhr-polling'];
+
     config.browserStack.build = buildLabel;
+    config.browserStack.startTunnel = false;
+
     config.sauceLabs.build = buildLabel;
+    config.sauceLabs.startConnect = false;
+    config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
 
     // TODO(vojta): remove once SauceLabs supports websockets.
     // This speeds up the capturing a bit, as browsers don't even try to use websocket.
-- 
cgit v1.2.3