From 70592c6d47ecad23d21f9b6d3ea3f58adae69fe2 Mon Sep 17 00:00:00 2001 From: Vincent Weevers Date: Sun, 1 Jul 2018 09:24:37 +0200 Subject: [PATCH 1/6] remove old coverage setup --- .travis.yml | 2 -- package.json | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f693496..a155814 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,6 @@ matrix: env: CMD=test - node_js: 10 env: CMD=test - - node_js: stable - env: CMD=report-coverage - node_js: stable env: CMD=test-browsers addons: diff --git a/package.json b/package.json index bf3fb3c..b8002f2 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,6 @@ "devDependencies": { "airtap": "^0.0.8", "faucet": "^0.0.1", - "istanbul": "^0.4.2", - "istanbul-coveralls": "^1.0.3", "rimraf": "^2.6.2", "standard": "^11.0.0", "tape": "^4.8.0" @@ -40,9 +38,7 @@ "scripts": { "test": "standard && node test.js | faucet", "test-browsers": "airtap --sauce-connect --loopback airtap.local --no-coverage test.js", - "test-browser-local": "airtap --no-coverage --local 9000 test.js", - "coverage": "istanbul cover -i memdown.js ./node_modules/.bin/tape ./test.js && istanbul check-coverage --lines 90 --function 80 --statements 90 --branches 80", - "report-coverage": "npm run coverage && istanbul-coveralls" + "test-browser-local": "airtap --no-coverage --local 9000 test.js" }, "license": "MIT", "engines": { From 720a9ac598c9f9ee8b331525cdb0e3ef3357b264 Mon Sep 17 00:00:00 2001 From: Vincent Weevers Date: Sun, 1 Jul 2018 09:29:19 +0200 Subject: [PATCH 2/6] add nyc and coveralls --- .gitignore | 1 + .travis.yml | 2 ++ package.json | 7 +++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 648ea07..1fd3331 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules coverage npm-debug.log +.nyc_output diff --git a/.travis.yml b/.travis.yml index a155814..61b16f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,5 +22,7 @@ matrix: script: - DEBUG=airtap:* npm run $CMD +after_success: npm run coverage + notifications: email: false diff --git a/package.json b/package.json index b8002f2..c921139 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,9 @@ }, "devDependencies": { "airtap": "^0.0.8", + "coveralls": "^3.0.2", "faucet": "^0.0.1", + "nyc": "^12.0.2", "rimraf": "^2.6.2", "standard": "^11.0.0", "tape": "^4.8.0" @@ -36,9 +38,10 @@ "./immediate.js": "./immediate-browser.js" }, "scripts": { - "test": "standard && node test.js | faucet", + "test": "standard && nyc --silent node test.js | faucet", "test-browsers": "airtap --sauce-connect --loopback airtap.local --no-coverage test.js", - "test-browser-local": "airtap --no-coverage --local 9000 test.js" + "test-browser-local": "airtap --no-coverage --local 9000 test.js", + "coverage": "nyc report --reporter=text-lcov | coveralls" }, "license": "MIT", "engines": { From 2b83f8e3a47f2e3ed1a03edc2ec2adeacd2dbc34 Mon Sep 17 00:00:00 2001 From: Vincent Weevers Date: Sun, 1 Jul 2018 12:13:30 +0200 Subject: [PATCH 3/6] temporarily depend on airtap/airtap#coverage --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c921139..e55079b 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "safe-buffer": "~5.1.1" }, "devDependencies": { - "airtap": "^0.0.8", + "airtap": "github:airtap/airtap#coverage", "coveralls": "^3.0.2", "faucet": "^0.0.1", "nyc": "^12.0.2", From aed8e833768246c19c698b29ea17de163a43d425 Mon Sep 17 00:00:00 2001 From: Vincent Weevers Date: Sun, 1 Jul 2018 12:13:55 +0200 Subject: [PATCH 4/6] coverage is opt-in now --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e55079b..b1e94f7 100644 --- a/package.json +++ b/package.json @@ -39,8 +39,8 @@ }, "scripts": { "test": "standard && nyc --silent node test.js | faucet", - "test-browsers": "airtap --sauce-connect --loopback airtap.local --no-coverage test.js", - "test-browser-local": "airtap --no-coverage --local 9000 test.js", + "test-browsers": "airtap --sauce-connect --loopback airtap.local --coverage test.js", + "test-browser-local": "airtap --coverage --local 9000 test.js", "coverage": "nyc report --reporter=text-lcov | coveralls" }, "license": "MIT", From 4cc233440cc0377515f08317549a755d08b14cb8 Mon Sep 17 00:00:00 2001 From: Vincent Weevers Date: Sun, 1 Jul 2018 13:28:05 +0200 Subject: [PATCH 5/6] remove faucet --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index b1e94f7..a949ccd 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "devDependencies": { "airtap": "github:airtap/airtap#coverage", "coveralls": "^3.0.2", - "faucet": "^0.0.1", "nyc": "^12.0.2", "rimraf": "^2.6.2", "standard": "^11.0.0", @@ -38,7 +37,7 @@ "./immediate.js": "./immediate-browser.js" }, "scripts": { - "test": "standard && nyc --silent node test.js | faucet", + "test": "standard && nyc node test.js", "test-browsers": "airtap --sauce-connect --loopback airtap.local --coverage test.js", "test-browser-local": "airtap --coverage --local 9000 test.js", "coverage": "nyc report --reporter=text-lcov | coveralls" From 923de0f56a1c0abc37b41895dffa23d2cbc03212 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Wed, 4 Jul 2018 11:29:24 +0200 Subject: [PATCH 6/6] Switch to airtap@0.0.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a949ccd..75a4a9a 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "safe-buffer": "~5.1.1" }, "devDependencies": { - "airtap": "github:airtap/airtap#coverage", + "airtap": "0.0.9", "coveralls": "^3.0.2", "nyc": "^12.0.2", "rimraf": "^2.6.2",