1 files changed, 52 insertions, 4 deletions
diff --git a/karma-shared.conf.js b/karma-shared.conf.js
index cd51697f..645660f7 100644
--- a/karma-shared.conf.js
+++ b/karma-shared.conf.js
@@ -15,6 +15,11 @@ module.exports = function(config, specificOptions) {
       tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER
     },
 
+    // BrowserStack config for Travis CI
+    browserStack: {
+      startTunnel: false
+    },
+
     // For more browsers on Sauce Labs see:
     // https://saucelabs.com/docs/platforms/webdriver
     customLaunchers: {
@@ -49,16 +54,59 @@ module.exports = function(config, specificOptions) {
         browserName: 'internet explorer',
         platform: 'Windows 2012',
         version: '10'
+      },
+
+      'BS_Chrome': {
+        base: 'BrowserStack',
+        browser: 'chrome',
+        os: 'OS X',
+        os_version: 'Mountain Lion'
+      },
+      'BS_Safari': {
+        base: 'BrowserStack',
+        browser: 'safari',
+        os: 'OS X',
+        os_version: 'Mountain Lion'
+      },
+      'BS_Firefox': {
+        base: 'BrowserStack',
+        browser: 'firefox',
+        os: 'Windows',
+        os_version: '8'
+      },
+      'BS_IE_8': {
+        base: 'BrowserStack',
+        browser: 'ie',
+        browser_version: '8.0',
+        os: 'Windows',
+        os_version: '7'
+      },
+      'BS_IE_9': {
+        base: 'BrowserStack',
+        browser: 'ie',
+        browser_version: '9.0',
+        os: 'Windows',
+        os_version: '7'
+      },
+      'BS_IE_10': {
+        base: 'BrowserStack',
+        browser: 'ie',
+        browser_version: '10.0',
+        os: 'Windows',
+        os_version: '8'
+      },
+      'BS_IE_11': {
+        base: 'BrowserStack',
+        browser: 'ie',
+        browser_version: '11.0',
+        os: 'Windows',
+        os_version: '8.1'
       }
     }
   });
 
 
   if (process.env.TRAVIS) {
-    // 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',