Improve our coverage configuration. (#2134)

lukesneeringer · stephenplusplus · commit 688ac58e72f9 · 2017-03-24T13:09:54.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,6 @@ packages/*/AUTHORS
 packages/*/CONTRIBUTORS
 packages/*/COPYING
 **/node_modules
-**/coverage/*
+**/.coverage/*
 docs/json
 *.log
diff --git a/.istanbul.yml b/.istanbul.yml
@@ -0,0 +1,9 @@
+---
+reporting:
+  dir: ./.coverage/
+  print: summary
+  watermarks:
+    branches: [95, 100]
+    functions: [95, 100]
+    lines: [95, 100]
+    statements: [95, 100]
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "glob": "^5.0.9",
     "globby": "^3.0.1",
     "is": "^3.1.0",
-    "istanbul": "^0.3.5",
+    "istanbul": "^0.4.5",
     "jscs": "^2.1.1",
     "jshint": "^2.9.1",
     "lodash.flatten": "^4.3.0",
@@ -41,7 +41,8 @@
     "snippet-test": "mocha --timeout 5000 --bail test/docs.js",
     "system-test": "mocha packages/*/system-test/*.js --no-timeouts --bail",
     "cover": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -x 'packages/*/src/*{/*,/**/*}.js' -- --no-timeouts --bail packages/*/test/*.js -R spec",
-    "coveralls": "npm run cover && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
+    "cover-html": "istanbul cover node_modules/mocha/bin/_mocha --report html -x 'packages/*/src/*{/*,/**/*}.js' -- --no-timeouts --bail packages/*/test/*.js -R spec",
+    "coveralls": "npm run cover && cat ./.coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
   },
   "license": "Apache-2.0",
   "engines": {
diff --git a/scripts/circle/test.sh b/scripts/circle/test.sh
@@ -42,7 +42,7 @@ npm run lint
 node ./scripts/build.js
 
 export COVERALLS_REPO_TOKEN="kEhKxvu3L9Z4GiClA9LcKYk7G9i9dl83k"
-export CIRCLE_ARTIFACTS="$(pwd)/coverage"
+export CIRCLE_ARTIFACTS="$(pwd)/.coverage"
 npm run postinstall # installs all modules
 npm run coveralls
 
@@ -56,4 +56,4 @@ rebuild
 npm run lint
 node ./scripts/build.js
 
-set +e
+set +e
