Merge pull request #291 from omh1280/coverage

Replace istanbul with nyc
CesiumGS · Jun 28, 2017 · 104a8df · 104a8df
2 parents 1db7d71 + c74e0e8
commit 104a8df
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ test
 specs/data/boxTexturedUnoptimized/output
 doc
 *.tgz
+.nyc_output
diff --git a/.npmignore b/.npmignore
@@ -11,3 +11,4 @@
 .appveyor.yml
 gulpfile.js
 *.tgz
+.nyc_output
diff --git a/README.md b/README.md
@@ -112,7 +112,7 @@ This will output a portion of the gltf-pipeline code into the `dist/cesium-combi
 
 ### Running Test Coverage
 
-Coverage uses [istanbul](https://github.com/gotwarlost/istanbul).  Run:
+Coverage uses [nyc](https://github.com/istanbuljs/nyc).  Run:
 ```
 npm run coverage
 ```

diff --git a/gulpfile.js b/gulpfile.js
@@ -80,9 +80,9 @@ gulp.task('coverage', function () {
         additionalExcludes += '-x "specs/lib/compressTexturesMultipleFormatsSpec.js"';
     }
 
-    child_process.execSync('istanbul' +
-        ' cover' +
-        ' --include-all-sources' +
+    child_process.execSync('nyc' +
+        ' --all' +
+        ' --reporter=lcov' +
         ' --dir coverage' +
         ' -x "specs/**" -x "bin/**" -x "coverage/**" -x "dist/**" -x "index.js" -x "gulpfile.js"' + additionalExcludes +
         ' node_modules/jasmine/bin/jasmine.js' +

diff --git a/package.json b/package.json
@@ -46,10 +46,10 @@
     "eslint": "^4.1.1",
     "eslint-config-cesium": "^2.0.0",
     "gulp": "^3.9.1",
-    "istanbul": "^0.4.5",
     "jasmine": "^2.5.2",
     "jasmine-spec-reporter": "^4.1.0",
     "jsdoc": "^3.4.3",
+    "nyc": "^11.0.2",
     "open": "^0.0.5",
     "requirejs": "^2.3.2"
   },