diff options
author | Feross Aboukhadijeh <feross@feross.org> | 2016-02-19 03:27:45 +0300 |
---|---|---|
committer | Feross Aboukhadijeh <feross@feross.org> | 2016-02-19 03:27:45 +0300 |
commit | 54ef9db15018d3831d3d9bc67bbcd70bbb88c1c1 (patch) | |
tree | 7c6c94eb40f2d55dde94cc25ce7923577bf9d2c5 | |
parent | b4376a9290eb7532a045f662d9cd1ddb33aceeec (diff) |
test: always run saucelabs test locally (#619)
I think this is a simpler approach for #619. Always run the sauce labs
tests locally. If users lack the right sauce labs credentials, they’ll
get an error and hopefully set up zuul correctly before sending a PR.
-rw-r--r-- | bin/test.js | 10 | ||||
-rw-r--r-- | package.json | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/bin/test.js b/bin/test.js index 1de9eac..6b2f3e9 100644 --- a/bin/test.js +++ b/bin/test.js @@ -1,15 +1,9 @@ #!/usr/bin/env node var spawn = require('cross-spawn-async') -var findNearestFile = require('find-nearest-file') -var path = require('path') -var userHome = require('user-home') -var pathExists = require('path-exists') -// .zuulrc logic from https://github.com/defunctzombie/zuul/blob/a0de46a5906c84b19f655c487f7c8debe938984d/bin/zuul#L384 -var zuulrcPath = findNearestFile('.zuulrc') || path.join(userHome, '.zuulrc') -var hasSauceLabEnvVars = process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY -var runSauceLabs = hasSauceLabEnvVars || pathExists.sync(zuulrcPath) +var runSauceLabs = !process.env.CI || + (process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY) npmRun('test-node', function () { npmRun('test-browser-headless', function () { diff --git a/package.json b/package.json index 54f6689..dbf44b1 100644 --- a/package.json +++ b/package.json @@ -83,14 +83,12 @@ "cross-spawn-async": "^2.0.0", "electron-prebuilt": "^0.36.7", "finalhandler": "^0.4.0", - "find-nearest-file": "^1.0.0", "run-series": "^1.0.2", "serve-static": "^1.9.3", "simple-get": "^2.0.0", "standard": "^6.0.1", "tape": "^4.0.0", "uglify-js": "^2.4.15", - "user-home": "^2.0.0", "zuul": "^3.0.0" }, "homepage": "https://webtorrent.io", |