From 513904c6f3c91e42525d9d36875351a8037f8e0d Mon Sep 17 00:00:00 2001 From: seebees Date: Fri, 12 Jul 2019 17:03:05 -0700 Subject: [PATCH 1/2] test: better code coverage reports istanbul wanted a `sourceRoot` property to map back the sourceMaps with. This makes `nyc merge` work. This means that all code coverage can now be merged into a single report. Also remove the lower line coverage and change the process chaining to `&&` so that CI will _always_ fail. --- karma.conf.js | 2 +- package.json | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 679b9be64..97a19af8e 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -29,7 +29,7 @@ module.exports = function (config) { options: { configFile: 'tsconfig.module.json', compilerOptions: { - rootDir: './' + sourceRoot: 'modules/' } } } diff --git a/package.json b/package.json index 479ec6f05..8761ccf3e 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,10 @@ "build": "run-s build-*", "mocha": "mocha --require source-map-support/register --require ts-node/register --exclude 'modules/*-+(browser|backend)/test/*test.ts' modules/**/test/*test.ts", "karma": "karma start karma.conf.js", - "coverage-browser": "npm run karma && nyc report --lines 70 -t .karma_output --exclude-after-remap false --check-coverage", - "coverage-node": "nyc --lines 70 --require ts-node/register --check-coverage --instrument -e .ts --all -n 'modules/**/src/*.ts' -x 'modules/**/test/*.ts' -x 'modules/*-+(browser|backend)/**/*.ts' npm run mocha", - "coverage": "run-s coverage-*", + "coverage-browser": "npm run karma && nyc report -t .karma_output --check-coverage --extension .ts", + "coverage-node": "nyc --require ts-node/register --instrument --extension .ts --all --check-coverage -n --lines 99 'modules/**/src/*.ts' -x 'modules/**/test/*.ts' -x 'modules/*-+(browser|backend)/**/*.ts' npm run mocha", + "coverage": "run-s coverage-* && nyc merge .karma_output .nyc_output/browser.json && nyc report --extension .ts --check-coverage", + "report-coverage": "nyc report --extension .ts --check-coverage -r html", "test": "npm run lint && npm run build && npm run coverage", "integration-browser-decrypt": "npm run build; lerna run build_fixtures --stream --no-prefix -- -- decrypt -v $npm_package_config_localTestVectors --karma", "integration-browser-encrypt": "npm run build; lerna run build_fixtures --stream --no-prefix -- -- encrypt -m $npm_package_config_encryptManifestList -k $npm_package_config_encryptKeyManifest -o $npm_package_config_decryptOracle --karma", From 67cf893b42032cdb2cd05abdbca2b4fde802f037 Mon Sep 17 00:00:00 2001 From: seebees Date: Thu, 25 Jul 2019 14:19:09 -0700 Subject: [PATCH 2/2] 90, not 99 :( --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8761ccf3e..ebc7b5412 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "mocha": "mocha --require source-map-support/register --require ts-node/register --exclude 'modules/*-+(browser|backend)/test/*test.ts' modules/**/test/*test.ts", "karma": "karma start karma.conf.js", "coverage-browser": "npm run karma && nyc report -t .karma_output --check-coverage --extension .ts", - "coverage-node": "nyc --require ts-node/register --instrument --extension .ts --all --check-coverage -n --lines 99 'modules/**/src/*.ts' -x 'modules/**/test/*.ts' -x 'modules/*-+(browser|backend)/**/*.ts' npm run mocha", + "coverage-node": "nyc --require ts-node/register --instrument --extension .ts --all --check-coverage -n 'modules/**/src/*.ts' -x 'modules/**/test/*.ts' -x 'modules/*-+(browser|backend)/**/*.ts' npm run mocha", "coverage": "run-s coverage-* && nyc merge .karma_output .nyc_output/browser.json && nyc report --extension .ts --check-coverage", "report-coverage": "nyc report --extension .ts --check-coverage -r html", "test": "npm run lint && npm run build && npm run coverage",