Add the proper browsers to the list, when using the MODE environment

variable.

Author: hansl

test/browser-providers.conf.js

@@ -285,8 +285,8 @@ var sauceAliases = {
   'SAFARI': ['SL_SAFARI7', 'SL_SAFARI8', 'SL_SAFARI9'],
   'BETA': ['SL_CHROMEBETA', 'SL_FIREFOXBETA'],
   'DEV': ['SL_CHROMEDEV', 'SL_FIREFOXDEV'],
-  'CI_REQUIRED': buildConfiguration('unitTest', 'SL', true),
-  'CI_OPTIONAL': buildConfiguration('unitTest', 'SL', false)
+  'REQUIRED': buildConfiguration('unitTest', 'SL', true),
+  'OPTIONAL': buildConfiguration('unitTest', 'SL', false)
 };
 
 var browserstackAliases = {
@@ -300,8 +300,8 @@ var browserstackAliases = {
   'IE': ['BS_IE9', 'BS_IE10', 'BS_IE11'],
   'IOS': ['BS_IOS7', 'BS_IOS8', 'BS_IOS9'],
   'SAFARI': ['BS_SAFARI7', 'BS_SAFARI8', 'BS_SAFARI9'],
-  'CI_REQUIRED': buildConfiguration('unitTest', 'BS', true),
-  'CI_OPTIONAL': buildConfiguration('unitTest', 'BS', false)
+  'REQUIRED': buildConfiguration('unitTest', 'BS', true),
+  'OPTIONAL': buildConfiguration('unitTest', 'BS', false)
 };
 
 module.exports = {
@@ -311,7 +311,7 @@ module.exports = {
 };
 
 function decode(str) {
-  return str.split('').reverse().join('');
+  return (str || '').split('').reverse().join('');
 }
 
 if (process.env.TRAVIS) {

test/karma.conf.js

@@ -72,26 +72,37 @@ module.exports = function(config) {
       pollingTimeout: 10000
     },
 
-    browsers: ['Firefox'],
+    browsers: ['Chrome'],
 
     singleRun: false
   });
 
   if (process.env.TRAVIS) {
     var buildId = `TRAVIS #${process.env.TRAVIS_BUILD_NUMBER} (${process.env.TRAVIS_BUILD_ID})`;
-    if (process.env.MODE.startsWith('saucelabs')) {
+
+    var modeSplit = process.env.MODE.split('_');
+    var platform = modeSplit[0];
+    var alias = modeSplit[1] || 'all';
+
+    if (platform == 'saucelabs') {
       config.sauceLabs.build = buildId;
       config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
 
       // TODO(mlaval): remove once SauceLabs supports websockets.
       // This speeds up the capturing a bit, as browsers don't even try to use websocket.
       console.log('>>>> setting socket.io transport to polling <<<<');
       config.transports = ['polling'];
-    }
 
-    if (process.env.MODE.startsWith('browserstack')) {
+      config.browsers = browserProvidersConf.sauceAliases[alias.toUpperCase()];
+    }
+    else if (platform == 'browserstack') {
       config.browserStack.build = buildId;
       config.browserStack.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
+
+      config.browsers = browserProvidersConf.sauceAliases[alias.uppercase()];
+    }
+    else {
+      throw new Error(`Platform "${platform}" unknown, but Travis specified. Exiting.`);
     }
   }
 };