test(e2e): run on Dartium, dart2js and sauce browsers

Command line runs will test Dartium by default if no BROWSERS are
specified.  If BROWSERS are specified, they all have to be local
browsers or all sauce browsers.  If you're only specifying sauce
browsers (e.g. SL_Chrome, SL_Firefox, etc.), you may optionally also
specify DartiumWithWebPlatform and this will run two instances of
Protractor.  (This is a limitation of Protractor's config.)

On Travis, the job for a specific SDK version tests both
DartiumWithWebPlatform as well as SL_Chrome.  SL_Firefox is currently
disabled because it's failing.  Note that prior to this commit, the
BROWSERS variable was always ignored.

Author: chirayuk

.travis.yml

@@ -26,25 +26,14 @@ env:
     BROWSERS=SL_Chrome,SL_Firefox
   - JOB=e2e-g3stable
     CHANNEL=stable
-    TESTS=vm
-    BROWSERS=DartiumWithWebPlatform
+    BROWSERS=DartiumWithWebPlatform,SL_Chrome
     USE_G3=YES
   - JOB=e2e-stable
     CHANNEL=stable
-    TESTS=vm
-    BROWSERS=DartiumWithWebPlatform
-  - JOB=e2e-dev
-    CHANNEL=dev
-    TESTS=vm
-    BROWSERS=DartiumWithWebPlatform
-  - JOB=e2e-stable
-    CHANNEL=stable
-    TESTS=dart2js
-    BROWSERS=SL_Chrome,SL_Firefox
+    BROWSERS=DartiumWithWebPlatform,SL_Chrome
   - JOB=e2e-dev
     CHANNEL=dev
-    TESTS=dart2js
-    BROWSERS=SL_Chrome,SL_Firefox
+    BROWSERS=DartiumWithWebPlatform,SL_Chrome
   global:
   - FIREFOX_VERSION="30.0"
   - CHROME_VERSION="35.0"

scripts/run-e2e-test.sh

@@ -154,7 +154,30 @@ fi
 run_protractor() {(
   local TEST_TYPE=$1
   local SPEC_FILE_VAR=TEST_${TEST_TYPE}_CONF
-  ./node_modules/.bin/protractor_dart ${!SPEC_FILE_VAR}
+  # Default browsers if none specified.
+  if [[ -z "$BROWSERS" ]]; then
+    export BROWSERS=DartiumWithWebPlatform
+  fi
+
+  # NOTE: Protractor can't test both sauce and local browsers in the same config.
+  #
+  # Local browsers only?
+  if [[ ! "$BROWSERS" =~ SL_ ]]; then
+    ./node_modules/.bin/protractor_dart ${!SPEC_FILE_VAR}
+  else
+    # Assume that we have only sauce browsers.  However, since
+    # DartiumWithWebPlatform isn't on Sauce yet, we'll also support this common
+    # use case by running twice - once for DartiumWithWebPlatform and again for
+    # the sauce browsers.
+    if [[ "$BROWSERS" =~ DartiumWithWebPlatform ]]; then
+      BROWSERS=DartiumWithWebPlatform ./node_modules/.bin/protractor_dart ${!SPEC_FILE_VAR}
+    fi
+    BROWSERS="${BROWSERS#DartiumWithWebPlatform}"
+    if [[ -n "$BROWSERS" ]]; then
+      BROWSERS="${BROWSERS#,}"
+      ./node_modules/.bin/protractor_dart ${!SPEC_FILE_VAR}
+    fi
+  fi
 )}
 export -f run_protractor
 

test_e2e/configQuery.js

@@ -44,27 +44,62 @@ function getDartiumBinary() {
 }
 
 
-function getChromeOptions() {
-    if (!runningOnTravis) {
-      return {'binary': getDartiumBinary()};
+function updateConfigForBrowsers(config, browsers, shards) {
+  shards = (shards == null) ? 1 : shards;
+  if (!browsers) {
+    throw new Error("updateConfigForBrowsers requires a list of browsers.");
+  }
+  if (browsers.length == 1 && browsers[0] == "DartiumWithWebPlatform") {
+    config.multiCapabilities = [{
+      browserName: 'chrome',
+      chromeOptions: {
+        binary: getDartiumBinary()
+      },
+      count: shards
+    }];
+    return;
+  }
+
+  // We can either test with local browsers or those on SauceLabs but not both.
+  var localBrowser = false, sauceBrowser = false;
+  config.multiCapabilities = [];
+  browsers.forEach(function(browser) {
+    if (browser.indexOf("SL_") == 0) {
+      sauceBrowser = true;
+      browser = browser.substr(3).toLowerCase();
+    } else {
+      localBrowser = true;
+      browser = browser.toLowerCase();
     }
-    // In Travis, the list of browsers to test is specified as a CSV in the
-    // BROWSERS environment variable.
-    // TODO(chirayu): Parse the BROWSERS csv so we also test on Firefox.
-    if (env.TESTS == "vm") {
-      return {'binary': env.DARTIUM_BIN};
+    if (localBrowser && sauceBrowser) {
+      throw new Error(
+          "You can either tests against local browsers or sauce " +
+          "browsers but not both.");
     }
-    if (env.TESTS == "dart2js") {
-      return {
-          'binary': env.CHROME_BIN,
-          // Ref: https://github.com/travis-ci/travis-ci/issues/938
-          //      https://sites.google.com/a/chromium.org/chromedriver/help/chrome-doesn-t-start
-          'args': ['no-sandbox=true']
+    var capability = { browserName: browser };
+    if (browser == "chrome") {
+      capability.chromeOptions = {
+        // Ref: https://github.com/travis-ci/travis-ci/issues/938
+        //      https://sites.google.com/a/chromium.org/chromedriver/help/chrome-doesn-t-start
+        args: ['no-sandbox=true']
       };
+      if (localBrowser && env.CHROME_BIN) {
+        capability.chromeOptions.binary = env.CHROME_BIN;
+      }
     }
-    throw new Error("Unknown Travis configuration specified by TESTS variable");
-}
+    config.multiCapabilities.push(capability);
+  });
 
+  if (sauceBrowser) {
+    config.seleniumAddress = null;
+    config.sauceUser = env.SAUCE_USERNAME;
+    config.sauceKey = env.SAUCE_ACCESS_KEY;
+    config.multiCapabilities.forEach(function(capability) {
+      capability['tunnel-identifier'] = env.TRAVIS_JOB_NUMBER;
+      capability['build'] = env.TRAVIS_BUILD_NUMBER;
+    });
+  }
+}
 
 exports.getBaseUrl = getBaseUrl;
-exports.getChromeOptions = getChromeOptions;
+exports.updateConfigForBrowsers = updateConfigForBrowsers;

test_e2e/examplesConf.js

@@ -23,12 +23,6 @@ var config = {
 
     splitTestsBetweenCapabilities: true,
 
-    multiCapabilities: [{
-      browserName: 'chrome',
-      chromeOptions: configQuery.getChromeOptions(),
-      count: 4
-    }],
-
     baseUrl: configQuery.getBaseUrl({
       envVar: "TEST_EXAMPLE_BASEURL"
     }),
@@ -41,17 +35,9 @@ var config = {
     },
 };
 
-// Saucelabs case.
-if (process.env.SAUCE_USERNAME != null) {
-  config.sauceUser = process.env.SAUCE_USERNAME;
-  config.sauceKey = process.env.SAUCE_ACCESS_KEY;
-  config.seleniumAddress = null;
-
-  config.multiCapabilities.forEach(function(capability) {
-    capability['tunnel-identifier'] = process.env.TRAVIS_JOB_NUMBER;
-    capability['build'] = process.env.TRAVIS_BUILD_NUMBER;
-    capability['name'] = 'AngularDart E2E Suite';
-  });
-}
+configQuery.updateConfigForBrowsers(config, process.env.BROWSERS.split(","), 4);
+config.multiCapabilities.forEach(function(capability) {
+  capability['name'] = 'AngularDart E2E Suite';
+});
 
 exports.config = config;

test_transformers/transformersE2eConf.js

@@ -18,17 +18,10 @@ var config = {
 
     specs: ['relative_uris_spec.dart'],
 
-    multiCapabilities: [{
-      browserName: 'chrome',
-      chromeOptions: configQuery.getChromeOptions(),
-      count: 1
-    }],
-
     baseUrl: configQuery.getBaseUrl({
       envVar: "TEST_TRANSFORMERS_BASEURL"
     }),
 
-
     jasmineNodeOpts: {
       isVerbose: true, // display spec names.
       showColors: true, // print colors to the terminal.
@@ -37,17 +30,9 @@ var config = {
     },
 };
 
-// Saucelabs case.
-if (process.env.SAUCE_USERNAME != null) {
-  config.sauceUser = process.env.SAUCE_USERNAME;
-  config.sauceKey = process.env.SAUCE_ACCESS_KEY;
-  config.seleniumAddress = null;
-
-  config.multiCapabilities.forEach(function(capability) {
-    capability['tunnel-identifier'] = process.env.TRAVIS_JOB_NUMBER;
-    capability['build'] = process.env.TRAVIS_BUILD_NUMBER;
-    capability['name'] = 'AngularDart Transformers E2E Suite';
-  });
-}
+configQuery.updateConfigForBrowsers(config, process.env.BROWSERS.split(","), 1);
+config.multiCapabilities.forEach(function(capability) {
+	capability['name'] = 'AngularDart Transformers E2E Suite';
+});
 
 exports.config = config;