fix(travis): Need only one script command in travis.yml

Otherwise the before_script stuff runs each time, which makes Sauce Labs
angry.

- Also fixed keepAlive options in the protractor runner so it fails the
  job when e2e tests fail

Author: c0bra

.travis.yml

@@ -39,10 +39,7 @@ before_script:
   - ./lib/sauce/sauce_connect_block.sh
 
 script:
-  # - ./travis_build.sh
-  - grunt
-  - grunt test:ci
-  - grunt test:e2e:ci
+  - ./travis_build.sh
 
 after_success:
   - grunt release

Gruntfile.js

@@ -138,8 +138,8 @@ module.exports = function(grunt) {
         configFile: "./test/protractor.conf.js"
       },
       singlerun: {
-        keepAlive: false,
         options: {
+          keepAlive: false,
           args: {
             seleniumPort: 4444,
             baseUrl: 'http://localhost:9999',
@@ -148,8 +148,8 @@ module.exports = function(grunt) {
         }
       },
       ci: {
-        keepAlive: false,
         options: {
+          keepAlive: false,
           args: {
             seleniumPort: 4444,
             baseUrl: 'http://localhost:9999',
@@ -160,8 +160,8 @@ module.exports = function(grunt) {
         }
       },
       auto: {
-        keepAlive: true,
         options: {
+          keepAlive: true,
           args: {
             seleniumPort: 4444,
             baseUrl: 'http://localhost:9999',

travis_build.sh

@@ -2,14 +2,19 @@
 
 set -e
 
-if [ $JOB = "unit" ]; then
-  grunt
-  grunt test:ci
-  grunt release
-elif [ $JOB = "e2e" ]; then
-  # grunt clean build test:e2e --browsers=SL_Chrome
-  grunt
-  grunt test:e2e:ci
-else
-  echo "Unknown job type. Please set JOB=unit or JOB=e2e."
-fi
+# NOTE: Travis build matrix won't let us run something after ALL matrix jobs succeed, so we have to run serially (below)
+# if [ $JOB = "unit" ]; then
+#   grunt
+#   grunt test:ci
+#   grunt release
+# elif [ $JOB = "e2e" ]; then
+#   # grunt clean build test:e2e --browsers=SL_Chrome
+#   grunt
+#   grunt test:e2e:ci
+# else
+#   echo "Unknown job type. Please set JOB=unit or JOB=e2e."
+# fi
+
+grunt
+grunt test:ci
+grunt test:e2e:ci