From 8e9a1d8b5d386de68e1c5fc786cc722c9b2bacc4 Mon Sep 17 00:00:00 2001 From: Ottavio Hartman Date: Tue, 20 Jun 2017 13:41:09 -0400 Subject: [PATCH 1/2] Replace istanbul with nyc --- .gitignore | 1 + README.md | 2 +- gulpfile.js | 6 +++--- package.json | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 09573eaa..01269947 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ test specs/data/boxTexturedUnoptimized/output doc *.tgz +.nyc_output diff --git a/README.md b/README.md index 5c13a543..9108afb0 100644 --- 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 index 117114f1..f0d435f8 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -101,9 +101,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 index e2f4cdfb..970ee655 100644 --- a/package.json +++ b/package.json @@ -46,10 +46,10 @@ "eslint-config-cesium": "^1.0.0", "gulp": "^3.9.1", "gulp-eslint": "^4.0.0", - "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" }, From 0e988de237d4d7bfc2109d7571ee7ecbc9d8bec4 Mon Sep 17 00:00:00 2001 From: Ottavio Hartman Date: Wed, 28 Jun 2017 09:24:53 -0400 Subject: [PATCH 2/2] Add .nyc_output to .npmignore --- .npmignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.npmignore b/.npmignore index 1417907b..edb77441 100644 --- a/.npmignore +++ b/.npmignore @@ -11,3 +11,4 @@ .appveyor.yml gulpfile.js *.tgz +.nyc_output