diff options
| author | Graeme Yeates <yeatesgraeme@gmail.com> | 2016-07-12 13:41:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-12 13:41:46 -0400 |
| commit | 4794563888a7715ac49d87586de82867b538abde (patch) | |
| tree | 8b55090a7999f2edb68515ec212317d379c5fed6 | |
| parent | db8a73799213299bfc5880dea68a15c3f187a9cc (diff) | |
| parent | 00f12da45d6df7b9e5115996d5071ae759531e1e (diff) | |
| download | async-4794563888a7715ac49d87586de82867b538abde.tar.gz | |
Merge pull request #1234 from tekwiz/fix/nyc-context-conflict
Fix nyc/code-coverage testing
| -rw-r--r-- | mocha_test/parallel.js | 2 | ||||
| -rw-r--r-- | mocha_test/series.js | 2 | ||||
| -rw-r--r-- | mocha_test/waterfall.js | 2 | ||||
| -rw-r--r-- | package.json | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/mocha_test/parallel.js b/mocha_test/parallel.js index bad98af..4f92642 100644 --- a/mocha_test/parallel.js +++ b/mocha_test/parallel.js @@ -192,7 +192,7 @@ describe('parallel', function() { }); }); - it('parallel call in another context', function(done) { + it('parallel call in another context @nycinvalid', function(done) { if (isBrowser()) { // node only test done(); diff --git a/mocha_test/series.js b/mocha_test/series.js index 0237582..80e54c2 100644 --- a/mocha_test/series.js +++ b/mocha_test/series.js @@ -137,7 +137,7 @@ describe('series', function() { }); }); - it('call in another context', function(done) { + it('call in another context @nycinvalid', function(done) { if (isBrowser()) { // node only test done(); diff --git a/mocha_test/waterfall.js b/mocha_test/waterfall.js index 7053b2c..c9abdc9 100644 --- a/mocha_test/waterfall.js +++ b/mocha_test/waterfall.js @@ -106,7 +106,7 @@ describe("waterfall", function () { }).to.throw(/already called/); }); - it('call in another context', function(done) { + it('call in another context @nycinvalid', function(done) { if (process.browser) { // node only test done(); diff --git a/package.json b/package.json index 2590d97..a4879ef 100644 --- a/package.json +++ b/package.json @@ -59,8 +59,8 @@ "yargs": "~3.9.1" }, "scripts": { - "coverage": "nyc npm run mocha-node-test && nyc report", - "coveralls": "npm run mocha-node-test && nyc report --reporter=text-lcov | coveralls", + "coverage": "nyc npm run mocha-node-test -- --grep @nycinvalid --invert", + "coveralls": "npm run coverage && nyc report --reporter=text-lcov | coveralls", "jsdoc": "jsdoc -c ./support/jsdoc/jsdoc.json && node support/jsdoc/jsdoc-fix-html.js", "lint": "eslint lib/ mocha_test/ perf/memory.js perf/suites.js perf/benchmark.js support/build/ support/*.js karma.conf.js", "mocha-browser-test": "karma start", |