Merge pull request #80 from angular/master

Update upstream

Author: GulajavaMinistudio

.travis.yml

@@ -15,8 +15,9 @@ branches:
 env:
   matrix:
     - JOB=ci-checks
-    - JOB=unit BROWSER_PROVIDER=saucelabs
-    - JOB=docs-e2e BROWSER_PROVIDER=saucelabs
+    - JOB=unit-core BROWSER_PROVIDER=saucelabs
+    - JOB=unit-jquery BROWSER_PROVIDER=saucelabs
+    - JOB=docs-app BROWSER_PROVIDER=saucelabs
     - JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=saucelabs
     - JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=saucelabs
   global:

docs/content/tutorial/step_14.ngdoc

@@ -328,7 +328,7 @@ The applied CSS classes are much the same as with `ngRepeat`. Each time a new pa
 ensures that all views are contained within a single HTML element, which allows for easy animation
 control.
 
-For more on CSS animations, see the [Web Platform documentation][webplatform-animations].
+For more on CSS animations, see the [MDN web docs][mdn-animations].
 
 
 ## Animating `ngClass` with JavaScript
@@ -561,4 +561,4 @@ There you have it! We have created a web application in a relatively short amoun
 [caniuse-css-transitions]: http://caniuse.com/#feat=css-transitions
 [jquery]: https://jquery.com/
 [jquery-animate]: https://api.jquery.com/animate/
-[webplatform-animations]: https://docs.webplatform.org/wiki/css/properties/animations
+[mdn-animations]: https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Animations/Using_CSS_animations

scripts/travis/before_build.sh

@@ -12,12 +12,12 @@ if [ "$JOB" != "ci-checks" ]; then
 fi
 
 # ci-checks and unit tests do not run against the packaged code
-if [ "$JOB" != "ci-checks" ] && [ "$JOB" != "unit" ]; then
+if [[ "$JOB" != "ci-checks" ]] && [[ "$JOB" != unit-* ]]; then
   grunt package
 fi
 
 # unit runs the docs tests too which need a built version of the code
-if [ "$JOB" = "unit" ]; then
+if [[ "$JOB" = unit-* ]]; then
   grunt bower
   grunt validate-angular-files
   grunt build

scripts/travis/build.sh

@@ -2,8 +2,18 @@
 
 set -e
 
-export BROWSER_STACK_ACCESS_KEY=`echo $BROWSER_STACK_ACCESS_KEY | rev`
-export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
+export BROWSER_STACK_ACCESS_KEY
+export SAUCE_ACCESS_KEY
+
+BROWSER_STACK_ACCESS_KEY=$(echo "$BROWSER_STACK_ACCESS_KEY" | rev)
+SAUCE_ACCESS_KEY=$(echo "$SAUCE_ACCESS_KEY" | rev)
+
+BROWSERS="SL_Chrome,SL_Chrome-1,\
+SL_Firefox,SL_Firefox-1,\
+SL_Safari_8,SL_Safari_9,\
+SL_iOS,\
+SL_IE_9,SL_IE_10,SL_IE_11,\
+SL_EDGE,SL_EDGE-1"
 
 case "$JOB" in
   "ci-checks")
@@ -17,18 +27,18 @@ case "$JOB" in
       yarn run commitplease -- "${TRAVIS_COMMIT_RANGE/.../..}"
     fi
     ;;
-  "unit")
-    if [[ "$BROWSER_PROVIDER" == "browserstack" ]]; then
-      BROWSERS="BS_Chrome,BS_Safari,BS_Firefox,BS_IE_9,BS_IE_10,BS_IE_11,BS_EDGE,BS_iOS_8,BS_iOS_9"
-    else
-      BROWSERS="SL_Chrome,SL_Chrome-1,SL_Firefox,SL_Firefox-1,SL_Safari_8,SL_Safari_9,SL_IE_9,SL_IE_10,SL_IE_11,SL_EDGE,SL_EDGE-1,SL_iOS"
-    fi
-
+  "unit-core")
     grunt test:promises-aplus
-    grunt test:unit --browsers="$BROWSERS" --reporters=spec
-    grunt tests:docs --browsers="$BROWSERS" --reporters=spec
+    grunt test:jqlite --browsers="$BROWSERS" --reporters=spec
+    grunt test:modules --browsers="$BROWSERS" --reporters=spec
     ;;
-  "docs-e2e")
+  "unit-jquery")
+    grunt test:jquery --browsers="$BROWSERS" --reporters=spec
+    grunt test:jquery-2.2 --browsers="$BROWSERS" --reporters=spec
+    grunt test:jquery-2.1 --browsers="$BROWSERS" --reporters=spec
+    ;;
+  "docs-app")
+    grunt tests:docs --browsers="$BROWSERS" --reporters=spec
     grunt test:travis-protractor --specs="docs/app/e2e/**/*.scenario.js"
     ;;
   "e2e")
@@ -71,6 +81,13 @@ case "$JOB" in
     fi
     ;;
   *)
-    echo "Unknown job type. Please set JOB=ci-checks, JOB=unit, JOB=deploy or JOB=e2e-*."
+    echo "Unknown job type. Please set JOB to one of\
+      'ci-checks',\
+      'unit-core',\
+      'unit-jquery',\
+      'docs-app',\
+      'e2e',\
+      or\
+      'deploy'."
     ;;
 esac