diff options
| author | Julie | 2014-01-30 18:49:58 -0800 |
|---|---|---|
| committer | Igor Minar | 2014-02-05 15:39:59 -0800 |
| commit | 0e85ca9ddb5f259908400463764fd6141977b341 (patch) | |
| tree | 88f0a17d6e1830a75c4c80451e7a84e559c95b2f /jenkins_build.sh | |
| parent | e7face4728d3aed6dc089966d489d0c93b65913d (diff) | |
| download | angular.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 'jenkins_build.sh')
| -rwxr-xr-x | jenkins_build.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/jenkins_build.sh b/jenkins_build.sh index 17610a92..bacac5e7 100755 --- a/jenkins_build.sh +++ b/jenkins_build.sh @@ -13,12 +13,6 @@ then BROWSERS="Chrome,Firefox,Opera,/Users/jenkins/bin/safari.sh,/Users/jenkins/bin/ie8.sh,/Users/jenkins/bin/ie9.sh" fi -if [[ -z "$BROWSERS_E2E" ]] -then - BROWSERS_E2E="Chrome,Firefox,/Users/jenkins/bin/safari.sh" -fi - - # CLEAN # rm -f angular.min.js.gzip.size rm -f angular.js.size @@ -28,6 +22,8 @@ rm -f angular.js.size npm install --color false grunt ci-checks package --no-color +mkdir test_out + # DOCS generator unit tests # grunt test:docgen --no-color @@ -35,7 +31,9 @@ grunt test:docgen --no-color grunt test:unit --browsers $BROWSERS --reporters=dots,junit --no-colors --no-color # END TO END TESTS # -grunt test:protractor +grunt test:ci-protractor +grunt test:ci-protractor --browser safari +grunt test:ci-protractor --browser firefox # Promises/A+ TESTS # grunt test:promises-aplus --no-color |