diff options
| author | Julie | 2014-02-06 11:29:24 -0800 |
|---|---|---|
| committer | Igor Minar | 2014-02-07 20:41:39 -0800 |
| commit | e645f7cae14618bd8fc7d6b3eadf9307f5a1aeb7 (patch) | |
| tree | 8b29f6602f45e83becac49e1311ad05ac15d052e /scripts | |
| parent | ad275b226551e45b68dace46af5fcd8178e31a60 (diff) | |
| download | angular.js-e645f7cae14618bd8fc7d6b3eadf9307f5a1aeb7.tar.bz2 | |
refactor(testing): split travis end to end tests into separate jobs for jquery and jqlite
Closes #6159
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis/build.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh index b07e2069..a415c35e 100755 --- a/scripts/travis/build.sh +++ b/scripts/travis/build.sh @@ -3,15 +3,18 @@ set -e export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev` -export BROWSER=${JOB#*-} if [ $JOB = "unit" ]; then grunt ci-checks grunt test:docgen 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 - grunt test:protractor --sauceUser $SAUCE_USERNAME \ +elif [ $JOB = "e2e" ]; then + export GRUNT_TARGET="test:protractor" + if [ $JQVERSION = "jquery" ]; then + GRUNT_TARGET="test:jq-protractor" + fi + grunt $GRUNT_TARGET --sauceUser $SAUCE_USERNAME \ --sauceKey $SAUCE_ACCESS_KEY \ --capabilities.tunnel-identifier=$TRAVIS_JOB_NUMBER \ --capabilities.build=$TRAVIS_BUILD_NUMBER \ |