build: use nyc for coverage testing

jshttp · Apr 30, 2019 · fd15255 · fd15255
1 parent 3757bbb
commit fd15255
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1,3 @@
+.nyc_output
 coverage
 node_modules
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,4 @@
-
-.DS_Store*
-*.log
-*.gz
-
-package-lock.json
-
+.nyc_output
 node_modules
 coverage
-cache
+package-lock.json
diff --git a/.travis.yml b/.travis.yml
@@ -63,17 +63,19 @@ before_install:
     # Configure eslint for linting
     if node_version_lt '6.0'; then npm_remove_module_re '^eslint(-|$)'
     fi
-  - |
-    # Configure istanbul for coverage
-    if node_version_lt '0.10'; then npm_remove_module_re '^istanbul$'
-    fi
   - |
     # Configure mocha for testing
     if   node_version_lt '0.8' ; then npm_use_module 'mocha' '1.21.5'
     elif node_version_lt '0.10'; then npm_use_module 'mocha' '2.5.3'
     elif node_version_lt '4.0' ; then npm_use_module 'mocha' '3.5.3'
     elif node_version_lt '6.0' ; then npm_use_module 'mocha' '5.2.0'
     fi
+  - |
+    # Configure nyc for testing
+    if   node_version_lt '0.10'; then npm_remove_module_re '^nyc$'
+    elif node_version_lt '4.0' ; then npm_use_module 'nyc' '10.3.2'
+    elif node_version_lt '6.0' ; then npm_use_module 'nyc' '11.9.0'
+    fi
   # Update Node.js modules
   - |
     # Prune & rebuild node_modules
@@ -98,7 +100,7 @@ script:
 after_script:
   - |
     # Upload coverage to coveralls if exists
-    if [[ -e ./coverage/lcov.info ]]; then
+    if [[ -d .nyc_output ]]; then
       npm install --save-dev coveralls@2
-      coveralls < ./coverage/lcov.info
+      nyc report --reporter=text-lcov | coveralls
     fi
diff --git a/package.json b/package.json
@@ -21,8 +21,8 @@
     "eslint-plugin-node": "8.0.1",
     "eslint-plugin-promise": "4.1.1",
     "eslint-plugin-standard": "4.0.0",
-    "istanbul": "0.4.5",
-    "mocha": "6.1.4"
+    "mocha": "6.1.4",
+    "nyc": "14.0.0"
   },
   "files": [
     "LICENSE",
@@ -35,8 +35,8 @@
   "scripts": {
     "lint": "eslint --plugin markdown --ext js,md .",
     "test": "mocha --reporter spec --check-leaks --bail test/",
-    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
-    "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/"
+    "test-cov": "nyc --reporter=html --reporter=text npm test",
+    "test-travis": "nyc --reporter=text npm test"
   },
   "keywords": [
     "content",