From 0e85ca9ddb5f259908400463764fd6141977b341 Mon Sep 17 00:00:00 2001
From: Julie
Date: Thu, 30 Jan 2014 18:49:58 -0800
Subject: chore(testing): run end to end tests on firefox and safari as well as
 chrome

Update the Travis and Jenkins configs to run protractor tests on Safari and Firefox as well,
and make the Travis tests run output XML and turn off color.

Fix tests which were failing in Firefox due to clear() not working as expected.

Fix tests which were failing in Safari due to SafariDriver not understanding the minus key,
and disable tests which SafariDriver has no support for.
---
 lib/grunt/utils.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib')

diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js
index 311bbef2..a3a7e7b2 100644
--- a/lib/grunt/utils.js
+++ b/lib/grunt/utils.js
@@ -141,6 +141,7 @@ module.exports = {
       // Skip the webdriver-manager update on Travis, since the browsers will
       // be provided remotely.
       done();
+      return;
     }
     var p = spawn('node', ['node_modules/protractor/bin/webdriver-manager', 'update']);
     p.stdout.pipe(process.stdout);
@@ -156,11 +157,16 @@ module.exports = {
     var sauceKey = grunt.option('sauceKey');
     var tunnelIdentifier = grunt.option('capabilities.tunnel-identifier');
     var sauceBuild = grunt.option('capabilities.build');
+    var browser = grunt.option('browser');
     var args = ['node_modules/protractor/bin/protractor', config];
     if (sauceUser) args.push('--sauceUser=' + sauceUser);
     if (sauceKey) args.push('--sauceKey=' + sauceKey);
     if (tunnelIdentifier) args.push('--capabilities.tunnel-identifier=' + tunnelIdentifier);
     if (sauceBuild) args.push('--capabilities.build=' + sauceBuild);
+    if (browser) {
+      args.push('--browser=' + browser);
+      args.push('--params.browser=' + browser);
+    }
 
 
     var p = spawn('node', args);
-- 
cgit v1.2.3