Skip to content

Commit

Permalink
(#5905) - Run saucelabs on all PRs
Browse files Browse the repository at this point in the history
  • Loading branch information
daleharvey committed Dec 8, 2017
1 parent 90f9dcb commit c11f63e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
13 changes: 3 additions & 10 deletions .travis.yml
Expand Up @@ -14,13 +14,10 @@ sudo:

addons:
firefox: "47.0.2"
jwt:
secure: YlCp9qGHmnnATcScIQVyOt8eI9FxLhMGAz9iRTHh7r41ADjfGJUzyqkWoBLcCagiQWtqtUujukPAtRuOibbBp9SvmGp+IIdbwHVUDvSZNOvGxkQ1qczeGxJcnht+2YNoCwfzkHW4vFrNiGOULdjvbWAB4sAJ8N0AZPShURwXU1E=

before_install:
- |
if [[ $TRAVIS_SECURE_ENV_VARS == "false" ]] && [[ $CLIENT == saucelabs:* ]]; then
echo "Not running test, cannot connect to saucelabs in Pull Request"
travis_terminate 0
fi
# Because Saucelabs doesnt proxy 5984 on OSX
- "if [ -z \"$COUCH_HOST\" ]; then export COUCH_HOST=http://127.0.0.1:3000; fi"

Expand Down Expand Up @@ -52,11 +49,7 @@ script: travis_retry npm run $COMMAND
env:
global:
- NPM_CONFIG_PROGRESS="false"
- secure: "WYQbfTXYwPfqz7t3ycqpXIDQdZ7C9kQJAP+08OF0cuR8eqhm7HxCiu9LjSNqoLAdlDmc55ygeS16Kn3Oht3zZ/i2Y7Gm75HcQfzUIb1sDv1xVm3aQmqZDJfAQ/r7fN8upBCLii/W8IUkJr1k717MpbdsTerIjyfPOb27hw0kJTM="
- secure: "Ut9pRqzbVJHxg8vt1Cx0bTv4HAroBkvOLjtHF+11f/OzfNnAORIEPnJFHqGbOTozCPOizmzgwvCGqq9gYL8SakrfiI0wBfaL+lk0ub/FPuJ1+hwrLDU0Ju4O5reL0OSu0JB+OTmXfILuRQQkD9/7uwUEbLDFId4phSq3cz1UsK0="
- secure: "MiufQQKR/EBoS7kcau/I7oYenVilysEqwx37zdgLEKlEUe3SxVOe31uLZv/bhfLNZiRuLAfmIOZmhLGnhMf0LaBzR2yC5qhBxrVHcAiTuS3q6zxpzEf02jnu+hACvj1kJJEPjpOLpEVx7ghWL4McEO0qLbdtSbQlm2IkOX1ONg0="
- secure: "b8GsgkwaNEOHmJni/rPsc1f3S1/+SxbN6hnXMV7bkSIOiRZAvcf68s3I0Sdln/OPuBmyzeLm5hZ7R8nsA/jYsYD5JUgEzcmF8glcxAeuhMgh9z5jBAfqFo5oUM6B7sE9I7t3/RZkSSkBGqOXIk/43voX1ZGIZBL17VKVPfNcoZ8="
- secure: "SSRTzT8OTeTpkGCLga74EGRfGmmRtsmAXbiXm1Xkg6tgQQmahxQJcrxr5QwHkdGdWkEIEudTd53AvZ/5KPmokmX/HiWsamdIj3WkrLdYvbEF4+mfqNa4oBBfrWXtPgPOG0vP1u5jPCK76S8qd7Ih8YrmAPUvecb04TnpVcLy+JM="
- SAUCE_USERNAME=pouchdb

matrix:
- CLIENT=node COMMAND=test
Expand Down
8 changes: 0 additions & 8 deletions bin/test-browser.js
Expand Up @@ -95,14 +95,6 @@ if (process.env.NEXT) {
testUrl += '?';
testUrl += querystring.stringify(qs);

// This should actually be already handled in .travis.yml
if (process.env.TRAVIS &&
client.runner === 'saucelabs' &&
process.env.TRAVIS_SECURE_ENV_VARS === 'false') {
console.error('Not running test, cannot connect to saucelabs in Pull Request');
process.exit(0);
}

function testError(e) {
console.error(e);
console.error('Doh, tests failed');
Expand Down

0 comments on commit c11f63e

Please sign in to comment.