aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJulie2014-01-30 18:49:58 -0800
committerIgor Minar2014-02-05 15:39:59 -0800
commit0e85ca9ddb5f259908400463764fd6141977b341 (patch)
tree88f0a17d6e1830a75c4c80451e7a84e559c95b2f /lib
parente7face4728d3aed6dc089966d489d0c93b65913d (diff)
downloadangular.js-0e85ca9ddb5f259908400463764fd6141977b341.tar.bz2
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/grunt/utils.js6
1 files changed, 6 insertions, 0 deletions
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);