diff options
| author | Julie | 2014-02-19 21:01:54 -0800 |
|---|---|---|
| committer | Julie | 2014-02-21 16:57:04 -0800 |
| commit | 39c82f3fb7a8459304d5e07dc87bd0623ad1efd0 (patch) | |
| tree | cff2cb48fa3199d40ab292cca9ddf5ee4ef5505e /scripts/travis | |
| parent | 1293cc88cd3d2e72c55fa8b8d268fab246e79fed (diff) | |
| download | angular.js-39c82f3fb7a8459304d5e07dc87bd0623ad1efd0.tar.bz2 | |
chore(travis): reorganize protractor configs to group by spec instead of by browser
Use the multiConfiguration ability of Protractor to start tests on multiple browsers
from the same travis cell. Group tests by type (jquery, jqlite, or docs tests) instead
of by browser. Turn on tests for jQuery.
Diffstat (limited to 'scripts/travis')
| -rwxr-xr-x | scripts/travis/build.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh index 9a0d268f..34422648 100755 --- a/scripts/travis/build.sh +++ b/scripts/travis/build.sh @@ -10,15 +10,13 @@ if [ $JOB = "unit" ]; then grunt test:promises-aplus grunt test:unit --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots elif [ $JOB = "e2e" ]; then - export GRUNT_TARGET="test:protractor" - if [ $JQVERSION = "jquery" ]; then - GRUNT_TARGET="test:jq-protractor" + export TARGET_SPECS="build/docs/ptore2e/**/*jqlite_test.js" + if [ $TEST_TARGET = "jquery" ]; then + TARGET_SPECS="build/docs/ptore2e/**/*jquery_test.js" + elif [ $TEST_TARGET = "doce2e" ]; then + TARGET_SPECS="test/e2e/docsAppE2E.js" fi - grunt $GRUNT_TARGET --sauceUser $SAUCE_USERNAME \ - --sauceKey $SAUCE_ACCESS_KEY \ - --capabilities.tunnel-identifier=$TRAVIS_JOB_NUMBER \ - --capabilities.build=$TRAVIS_BUILD_NUMBER \ - --browser=$BROWSER + grunt test:travis-protractor --specs "$TARGET_SPECS" else echo "Unknown job type. Please set JOB=unit or JOB=e2e-*." fi |