diff --git a/.travis.yml b/.travis.yml index 1bd4929..3b36c79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,18 @@ -language: node_js +language: node_js node_js: node -script: -- npm run test +addons: + chrome: stable +script: +- npm run test:lint +- | + if [ $TRAVIS_PULL_REQUEST != false ] && [ $TRAVIS_SECURE_ENV_VARS == true ]; then + echo "Pull request with secure environment variables, running Sauce tests..."; + npm run test:polymer:sauce || travis_terminate 1; + else + echo "Not a pull request and/or no secure environment variables, running headless tests..."; + npm run test:polymer:local || travis_terminate 1; + fi +env: + global: + - SAUCE_USERNAME: Desire2Learn + - secure: RtWC2uMUHvox7Y/qdWd7wrxEYedg1MdnZp9aoI2jL8KP4gi/efeFhzBIjIShnv6hnkJdf7Vy+5PTwgp4q6i4HZzmIAjyEGX+J5xd8emd3yrYg2puBrKI4bE+qzjnrWsc/9tbeqbRviFZzJzLzGCz9t1H3m/USKnzU71z7M3lFlA= diff --git a/d2l-offscreen.html b/d2l-offscreen.html index 5878fae..a3e5b00 100644 --- a/d2l-offscreen.html +++ b/d2l-offscreen.html @@ -9,7 +9,7 @@ --> -