From ec06c66be7328984e2de3c0e4879a49715469512 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Wed, 21 Feb 2018 10:21:43 -0800 Subject: [PATCH 1/6] zuul -> airtap --- .zuul.yml => .airtap.yml | 3 ++- .travis.yml | 7 +++++-- package.json | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) rename .zuul.yml => .airtap.yml (68%) diff --git a/.zuul.yml b/.airtap.yml similarity index 68% rename from .zuul.yml rename to .airtap.yml index 6f2c7b62..dfc57a01 100644 --- a/.zuul.yml +++ b/.airtap.yml @@ -1,4 +1,5 @@ -ui: tape +sauce_connect: true +loopback: airtap.local browsers: - name: chrome version: -1..latest diff --git a/.travis.yml b/.travis.yml index b9cac9ab..5263d1b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,12 @@ env: - secure: AJsEWFnWC5W8hcF3hJzm3PT7heazJpKg85xiSvIWVzLHZU/s0h4+WfJ6t0F9v3L4awaowm62vy8CRaxRkB4lJyJg+JK2K0QN7lNFGj2f8Jx2cFlVJ1IyY959GY4iUg66JrNj1yzS02+yQfweDngyifqzb7IlxnowiveDjUO2gyo= - secure: hvihwLUqlPchrGFXKWFF7iKRugISU7r/gLBo6O63nPeg0OwnYqYcC2BnBWoSiOdu9oR5bM4a5u0os04XL+bP3dqt324g0uBTqvyyxD6NhBsphVFkUmdUH3HMe7IQY6JTns96KT/6UkQapKhIuW4CUDeidR+5NFKvyRdKIjSawS4= -# For Electron testing on Linux -# https://github.com/electron/electron/blob/master/docs/tutorial/testing-on-headless-ci.md addons: + sauce_connect: true + hosts: + - airtap.local + # For Electron testing on Linux + # https://github.com/electron/electron/blob/master/docs/tutorial/testing-on-headless-ci.md apt: packages: - xvfb diff --git a/package.json b/package.json index 4fed9ccb..ef3602f1 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "zero-fill": "^2.2.3" }, "devDependencies": { + "airtap": "0.0.1", "babili": "^0.1.4", "bittorrent-tracker": "^9.4.0", "brfs": "^1.4.3", @@ -82,8 +83,7 @@ "serve-static": "^1.11.1", "standard": "*", "tape": "^4.6.0", - "webtorrent-fixtures": "^1.5.0", - "zuul": "^3.10.1" + "webtorrent-fixtures": "^1.5.0" }, "engines": { "node": ">=4" From d91cf59d4282430c77b96a047306ea7d3c5e017d Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Wed, 21 Feb 2018 10:21:48 -0800 Subject: [PATCH 2/6] travis: test node LTS --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5263d1b3..e7ed93b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - 'node' + - lts/* sudo: true env: global: From 15b3b6ea8fed4fce7f482d43408f9073c60127f5 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Wed, 21 Feb 2018 10:22:32 -0800 Subject: [PATCH 3/6] do not cache node_modules It's worth taking a bit of extra time to avoid npm cache bugs, and to get a more accurate test of a fresh install on a new user's machine --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7ed93b1..b89b2d33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,3 @@ addons: before_script: - export DISPLAY=':99.0' - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & -cache: - directories: - - node_modules From 5c221474e04bb265d45c3f414fffc5e1fdcde35d Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Wed, 21 Feb 2018 10:28:23 -0800 Subject: [PATCH 4/6] zuul -> airtap --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ef3602f1..029bd1b6 100644 --- a/package.json +++ b/package.json @@ -116,9 +116,9 @@ "build-debug": "browserify -s WebTorrent -e ./ > webtorrent.debug.js", "size": "npm run build && cat webtorrent.min.js | gzip | wc -c", "test": "standard && node ./bin/test.js", - "test-browser": "zuul -- test/*.js test/browser/*.js", "test-browser-headless": "zuul --electron -- test/*.js test/browser/*.js", - "test-browser-local": "zuul --local -- test/*.js test/browser/*.js", + "test-browser": "airtap -- test/*.js test/browser/*.js", + "test-browser-local": "airtap --local -- test/*.js test/browser/*.js", "test-node": "tape test/*.js test/node/*.js", "update-authors": "./bin/update-authors.sh" } From 72afbf59359bb11ca2308e9fe31fddd128c10fa5 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Wed, 21 Feb 2018 10:28:45 -0800 Subject: [PATCH 5/6] remove test-browser-headless Not ideal to lose Electron testing, but I think this is net win for now. --- bin/test.js | 8 +++----- package.json | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bin/test.js b/bin/test.js index 7c6da9cc..f1be65fd 100644 --- a/bin/test.js +++ b/bin/test.js @@ -6,11 +6,9 @@ var runSauceLabs = !process.env.CI || (process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY) npmRun('test-node', function () { - npmRun('test-browser-headless', function () { - if (runSauceLabs) { - npmRun('test-browser') - } - }) + if (runSauceLabs) { + npmRun('test-browser') + } }) function npmRun (scriptName, onSuccess) { diff --git a/package.json b/package.json index 029bd1b6..750ccdc3 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,6 @@ "build-debug": "browserify -s WebTorrent -e ./ > webtorrent.debug.js", "size": "npm run build && cat webtorrent.min.js | gzip | wc -c", "test": "standard && node ./bin/test.js", - "test-browser-headless": "zuul --electron -- test/*.js test/browser/*.js", "test-browser": "airtap -- test/*.js test/browser/*.js", "test-browser-local": "airtap --local -- test/*.js test/browser/*.js", "test-node": "tape test/*.js test/node/*.js", From b9d5de9607491cb1d6252c5af1ac725e691b8c75 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Wed, 21 Feb 2018 10:46:46 -0800 Subject: [PATCH 6/6] airtap: only test latest browsers --- .airtap.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.airtap.yml b/.airtap.yml index dfc57a01..da2f955a 100644 --- a/.airtap.yml +++ b/.airtap.yml @@ -2,6 +2,6 @@ sauce_connect: true loopback: airtap.local browsers: - name: chrome - version: -1..latest + version: latest - name: firefox - version: -1..latest + version: latest