testing: rm istanbul, add nyc (#2277)

stephenplusplus · web-flow · commit 890c2fa5cc74 · 2017-05-09T14:27:04.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
+**/*.log
+**/node_modules
+.coverage
+.nyc_output
+docs/json
 packages/google-cloud/README.md
 packages/*/AUTHORS
 packages/*/CONTRIBUTORS
 packages/*/COPYING
-**/node_modules
-**/.coverage/*
-docs/json
-*.log
diff --git a/.istanbul.yml b/.istanbul.yml
diff --git a/package.json b/package.json
@@ -13,14 +13,14 @@
     "glob": "^5.0.9",
     "globby": "^3.0.1",
     "is": "^3.1.0",
-    "istanbul": "^0.4.5",
     "jscs": "^2.1.1",
     "jshint": "^2.9.1",
     "lodash.flatten": "^4.3.0",
     "lodash.template": "^4.3.0",
     "mitm": "^1.1.0",
     "mocha": "^2.5.3",
     "multiline": "^1.0.2",
+    "nyc": "^10.3.0",
     "package-json": "^2.4.0",
     "propprop": "^0.3.1",
     "semver": "^5.3.0",
@@ -40,9 +40,32 @@
     "unit-test": "mocha --timeout 5000 --bail packages/*/test/*.js",
     "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 packages/*/test/*.js -R spec",
-    "cover-html": "istanbul cover node_modules/mocha/bin/_mocha --report html -x 'packages/*/src/*{/*,/**/*}.js' -- --no-timeouts packages/*/test/*.js -R spec",
-    "coveralls": "npm run cover && cat ./.coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
+    "cover": "nyc --reporter=lcov --reporter=html mocha --no-timeouts packages/*/test/*.js",
+    "coveralls": "nyc --reporter=text-lcov mocha --no-timeouts packages/*/test/*.js | ./node_modules/coveralls/bin/coveralls.js"
+  },
+  "nyc": {
+    "report-dir": "./.coverage",
+    "exclude": [
+      "packages/*/src/*{/*,/**/*}.js"
+    ],
+    "watermarks": {
+      "branches": [
+        95,
+        100
+      ],
+      "functions": [
+        95,
+        100
+      ],
+      "lines": [
+        95,
+        100
+      ],
+      "statements": [
+        95,
+        100
+      ]
+    }
   },
   "license": "Apache-2.0",
   "engines": {
