.travis.yml

@@ -15,7 +15,7 @@ env:
     - BROWSER_STACK_USERNAME=VojtaJina
     - BROWSER_STACK_ACCESS_KEY=ve8DdEwSkBpXWpZ1JQCQ
     - LOGS_DIR=/tmp/angular-build/logs
-    - BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready
+    - BROWSER_PROVIDER_READY_FILE=/tmp/browserstack-tunnel-ready
 
 install:
   # - npm config set registry http://23.251.144.68
@@ -29,7 +29,6 @@ install:
 before_script:
   - mkdir -p $LOGS_DIR
   - ./lib/browser-stack/start-tunnel.sh
-  # - ./lib/sauce/sauce_connect_setup.sh
   - npm install -g grunt-cli
   - grunt package
   - ./scripts/travis/wait_for_browser_provider.sh

karma-shared.conf.js

@@ -9,7 +9,7 @@ module.exports = function(config, specificOptions) {
     browsers: ['Chrome'],
     browserDisconnectTimeout: 10000,
     browserDisconnectTolerance: 2,
-    browserNoActivityTimeout: 60000,
+    browserNoActivityTimeout: 30000,
 
 
     // SauceLabs config for local development.
@@ -114,21 +114,17 @@ module.exports = function(config, specificOptions) {
     var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
 
     config.logLevel = config.LOG_DEBUG;
-    // config.transports = ['websocket', 'xhr-polling'];
     config.captureTimeout = 0; // rely on SL timeout
+    config.browserNoActivityTimeout: 60000,
 
     config.browserStack.build = buildLabel;
-    // config.browserStack.startTunnel = false;
+    config.browserStack.startTunnel = false;
 
     config.sauceLabs.build = buildLabel;
     config.sauceLabs.startConnect = false;
     config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
     config.sauceLabs.recordScreenshots = true;
 
-    // TODO(vojta): remove once SauceLabs supports websockets.
-    // This speeds up the capturing a bit, as browsers don't even try to use websocket.
-    config.transports = ['xhr-polling'];
-
     // Debug logging into a file, that we print out at the end of the build.
     config.loggers.push({
       type: 'file',

lib/browser-stack/start-tunnel.js

@@ -8,6 +8,7 @@ var HOSTNAME = 'localhost';
 var PORTS = [9876, 8000];
 var ACCESS_KEY = process.env.BROWSER_STACK_ACCESS_KEY;
 var READY_FILE = process.env.BROWSER_PROVIDER_READY_FILE;
+var TUNNEL_IDENTIFIER = process.env.TRAVIS_JOB_NUMBER;
 
 // We need to start fake servers, otherwise the tunnel does not start.
 var fakeServers = [];
@@ -24,6 +25,7 @@ PORTS.forEach(function(port) {
 
 var tunnel = new BrowserStackTunnel({
   key: ACCESS_KEY,
+  tunnelIdentifier: TUNNEL_IDENTIFIER,
   hosts: hosts
 });
 

protractor-travis-conf.js

@@ -10,34 +10,36 @@ config.multiCapabilities = [{
   'browserstack.key': process.env.BROWSER_STACK_ACCESS_KEY,
   'browserstack.local' : 'true',
   'browserstack.debug': 'true',
+  'browserstack.tunnelIdentifier': process.env.TRAVIS_JOB_NUMBER,
+  'tunnelIdentifier': process.env.TRAVIS_JOB_NUMBER,
 
   'browserName': 'chrome',
   'platform': 'MAC',
   'name': 'Angular E2E',
   'build': process.env.TRAVIS_BUILD_NUMBER,
   'version': '34'
-}, {
-  'browserstack.user': process.env.BROWSER_STACK_USERNAME,
-  'browserstack.key': process.env.BROWSER_STACK_ACCESS_KEY,
-  'browserstack.local' : 'true',
-  'browserstack.debug': 'true',
-
-  'browserName': 'firefox',
-  'name': 'Angular E2E',
-  'build': process.env.TRAVIS_BUILD_NUMBER,
-  'version': '28'
-}, {
-  'browserstack.user': process.env.BROWSER_STACK_USERNAME,
-  'browserstack.key': process.env.BROWSER_STACK_ACCESS_KEY,
-  'browserstack.local' : 'true',
-  'browserstack.debug': 'true',
-
-  'browserName': 'safari',
-  'platform': 'MAC',
-  'version': '7',
-  'name': 'Angular E2E',
-  'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
-  'build': process.env.TRAVIS_BUILD_NUMBER
+// }, {
+//   'browserstack.user': process.env.BROWSER_STACK_USERNAME,
+//   'browserstack.key': process.env.BROWSER_STACK_ACCESS_KEY,
+//   'browserstack.local' : 'true',
+//   'browserstack.debug': 'true',
+
+//   'browserName': 'firefox',
+//   'name': 'Angular E2E',
+//   'build': process.env.TRAVIS_BUILD_NUMBER,
+//   'version': '28'
+// }, {
+//   'browserstack.user': process.env.BROWSER_STACK_USERNAME,
+//   'browserstack.key': process.env.BROWSER_STACK_ACCESS_KEY,
+//   'browserstack.local' : 'true',
+//   'browserstack.debug': 'true',
+
+//   'browserName': 'safari',
+//   'platform': 'MAC',
+//   'version': '7',
+//   'name': 'Angular E2E',
+//   'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
+//   'build': process.env.TRAVIS_BUILD_NUMBER
 }];
 
 config.allScriptsTimeout = 30000;