Trying out a basic port of ci-lite.

Author: heathkit

.travis.yml

@@ -12,6 +12,7 @@ env:
     - SAUCE_ACCESS_KEY=72e4f85f-4e6b-4971-b8c5-f6707308f63e
     - SAUCE_USERNAME="mgiambalvo"
     - SAUCE_CONNECT_VERSION="4.4.0"
+    - LOGS_DIR="/tmp/logs"
   matrix:
     - CI_MODE=local
     - CI_MODE=saucelabs
@@ -23,11 +24,10 @@ cache:
 install:
   - cd tour-of-heroes
   - npm install
+  - cd ..
 
 before_script:
   - ./scripts/travis_setup.sh
 
 script:
-  - npm run lint
-  - npm run test -- --watch=false
-  - npm run travis
+  - ./scripts/travis_test.sh

scripts/env.sh

@@ -0,0 +1,4 @@
+export SAUCE_ACCESS_KEY="72e4f85f-4e6b-4971-b8c5-f6707308f63e"
+export SAUCE_USERNAME="mgiambalvo"
+export SAUCE_CONNECT_VERSION="4.4.0"
+export LOGS_DIR="/tmp/logs"

scripts/travis_setup.sh

@@ -1,11 +1,15 @@
 # Sets up the test environment on Travis.
 
+set -ex -o pipefail
+cd `dirname $0`
+source ./env.sh
+
 # Start Xvfb when running locally.
 if [[ ${TRAVIS} && (${CI_MODE} == "local") ]]; then
   /etc/init.d/xvfb start
 fi
 
 # Start SauceConnect when running on SauceLabs.
 if [[ ${TRAVIS} && (${CI_MODE} == "saucelabs") ]]; then
-  ./scripts/sauce_connect_setup.sh
+  ./sauce_connect_setup.sh
 fi

scripts/travis_test.sh

@@ -1,3 +1,17 @@
 # Runs the Travis CI
 
+set -ex -o pipefail
+cd `dirname $0`
+source ./env.sh
+cd ../tour-of-heroes
 
+ng build
+npm run lint
+npm run test -- --watch=false
+
+# When using saucelabs, use a different config.
+if [[ ${TRAVIS} && (${CI_MODE} == "saucelabs") ]]; then
+  PROTRACTOR_CONFIG="protractor-saucelabs.conf.js"
+fi
+
+concurrently --success first --kill-others \"lite-server\" \"protractor $PROTRACTOR_CONFIG\"

tour-of-heroes/package.json

@@ -8,9 +8,7 @@
     "lint": "tslint \"src/**/*.ts\"",
     "test": "ng test",
     "pree2e": "webdriver-manager update",
-    "e2e": "protractor",
-    "pretravis": "ng build",
-    "travis": "concurrently --success first --kill-others \"lite-server\" \"npm run e2e\""
+    "e2e": "protractor"
   },
   "private": true,
   "dependencies": {

tour-of-heroes/protractor-saucelabs.conf.js

@@ -0,0 +1,9 @@
+var defaultConfig = require('./protractor.conf.js').config;
+
+var ciConfig = {
+  sauceUser: process.env.SAUCE_USERNAME,
+  sauceKey: process.env.SAUCE_ACCESS_KEY
+};
+
+exports.config = Object.assign(defaultConfig, ciConfig);
+console.log(exports.config);