Merge branch 'openSourcePPaaS' into openSourcePPaaSScripting

FamilySearch · Sep 14, 2023 · 657296d · 657296d
2 parents 177ecd6 + eb23388
commit 657296d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,8 @@
 /test-*.json
 /integration.json
 node_modules
-.nyc_output
+.nyc_output/
+coverage/
 testmerge.json
 .env.local*
 .env.development.local*

diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "testonly:agent": "cd agent && npm run testonly",
     "testonly:controller": "cd controller && npm run testonly",
     "testonly": "npm-run-all --parallel testonly:common testonly:agent testonly:controller",
-    "testmerge": "mkdir -p .nyc_output && cp common/.nyc_output/*.json .nyc_output/ && cp agent/.nyc_output/*.json .nyc_output/ && cp controller/.nyc_output/*.json .nyc_output/ && nyc merge .nyc_output testmerge.json && nyc report --reporter=lcov --reporter=text",
+    "testmerge": "mkdir -p .nyc_output && rimraf .nyc_output/*.json && cp common/.nyc_output/*.json .nyc_output/ && cp agent/.nyc_output/*.json .nyc_output/ && cp controller/.nyc_output/*.json .nyc_output/ && nyc merge .nyc_output testmerge.json && nyc report --reporter=lcov --reporter=text",
     "test": "npm-run-all --serial linterror build:test testonly && npm run testmerge",
     "testslow": "npm run linterror && npm run test:common && npm run test:agent && npm run test:controller",
     "test:common": "cd common && npm run test",