From b4376a9290eb7532a045f662d9cd1ddb33aceeec Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Thu, 18 Feb 2016 16:21:44 -0800 Subject: [PATCH 1/2] remove duplicate dep from #619 --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 17ffa8bb..54f6689d 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,6 @@ "electron-prebuilt": "^0.36.7", "finalhandler": "^0.4.0", "find-nearest-file": "^1.0.0", - "path-exists": "^2.1.0", "run-series": "^1.0.2", "serve-static": "^1.9.3", "simple-get": "^2.0.0", From 54ef9db15018d3831d3d9bc67bbcd70bbb88c1c1 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Thu, 18 Feb 2016 16:27:45 -0800 Subject: [PATCH 2/2] test: always run saucelabs test locally (#619) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- bin/test.js | 10 ++-------- package.json | 2 -- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/bin/test.js b/bin/test.js index 1de9eacc..6b2f3e92 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 54f6689d..dbf44b1b 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",