diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | travis_build.sh | 13 | 
2 files changed, 14 insertions, 4 deletions
| diff --git a/.travis.yml b/.travis.yml index 38ac9be1..3fd054aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,13 @@ node_js:    - 0.10  env: +  matrix: +    - JOB=unit +    - JOB=e2e    global:      - SAUCE_USERNAME=angular-ci      - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987 +    # rename to BROWSER_PROVIDER_READY_FILE      - SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready      - BROWSER_STACK_USERNAME=VojtaJina      - BROWSER_STACK_ACCESS_KEY=HAfHZaypxAc3PEUrUU9a @@ -21,7 +25,6 @@ before_script:    - ./lib/sauce/sauce_connect_block.sh  script: -  - grunt ci-checks    - ./travis_build.sh  after_script: diff --git a/travis_build.sh b/travis_build.sh index 04845058..6467bc1a 100755 --- a/travis_build.sh +++ b/travis_build.sh @@ -4,6 +4,13 @@ set -e  export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev` -grunt parallel:travis --reporters dots \ -  --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 \ -  --e2e-browsers SL_Chrome +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:e2e --browsers SL_Chrome --reporters dots +else +  echo "Unknown job type. Please set JOB=unit or JOB=e2e." +fi | 
