aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/travis
diff options
context:
space:
mode:
authorJulie2014-01-30 22:09:09 -0800
committerIgor Minar2014-02-05 15:40:16 -0800
commit84467d869730c6821c07496f510355ab73e7c10b (patch)
tree726315b47d229fd92ba6dd5390dd12e117234826 /scripts/travis
parent0e85ca9ddb5f259908400463764fd6141977b341 (diff)
downloadangular.js-84467d869730c6821c07496f510355ab73e7c10b.tar.bz2
refactor(testing): run end to end tests on separate browsers in parallel
Diffstat (limited to 'scripts/travis')
-rwxr-xr-xscripts/travis/build.sh13
1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
index b28b8e02..b07e2069 100755
--- a/scripts/travis/build.sh
+++ b/scripts/travis/build.sh
@@ -3,20 +3,19 @@
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
- export SAUCE_OPTIONS="--sauceUser $SAUCE_USERNAME \
+elif [[ $JOB == e2e* ]]; then
+ grunt test:protractor --sauceUser $SAUCE_USERNAME \
--sauceKey $SAUCE_ACCESS_KEY \
--capabilities.tunnel-identifier=$TRAVIS_JOB_NUMBER \
- --capabilities.build=$TRAVIS_BUILD_NUMBER"
- grunt test:protractor $SAUCE_OPTIONS
- grunt test:protractor $SAUCE_OPTIONS --browser=firefox
- grunt test:protractor $SAUCE_OPTIONS --browser=safari
+ --capabilities.build=$TRAVIS_BUILD_NUMBER \
+ --browser=$BROWSER
else
- echo "Unknown job type. Please set JOB=unit or JOB=e2e."
+ echo "Unknown job type. Please set JOB=unit or JOB=e2e-*."
fi