Merge pull request #2322 from akshita31/istanbul_report

Remove istanbul-combine
dotnet · May 18, 2018 · 9487d98 · 9487d98
2 parents 4c35ca5 + 4692387
commit 9487d98
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 192 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -120,7 +120,6 @@
     "gulp-mocha": "5.0.0",
     "gulp-tslint": "8.1.3",
     "istanbul": "0.4.5",
-    "istanbul-combine": "0.3.0",
     "ltcdr": "2.2.1",
     "minimist": "1.2.0",
     "mocha": "5.0.4",

diff --git a/tasks/coverageTasks.ts b/tasks/coverageTasks.ts
@@ -9,7 +9,7 @@ import * as gulp from 'gulp';
 import * as path from 'path';
 import * as del from 'del';
 import spawnNode from './spawnNode';
-import { coverageRootPath, nycOutputPath, nycPath, codeExtensionSourcesPath, integrationTestCoverageRootPath, integrationTestNycOutputPath, istanbulCombinePath, codecovPath, unitTestCoverageRootPath } from './projectPaths';
+import { coverageRootPath, nycOutputPath, nycPath, codeExtensionSourcesPath, integrationTestCoverageRootPath, integrationTestNycOutputPath, istanbulPath, codecovPath, unitTestCoverageRootPath } from './projectPaths';
 
 gulp.task("cov:instrument", async () => {
     del(coverageRootPath);
@@ -29,25 +29,27 @@ gulp.task("cov:instrument", async () => {
 
 gulp.task("cov:merge", async () => {
     return spawnNode([
-        istanbulCombinePath,
-        '-d',
+        istanbulPath,
+        'report',
+        '--dir',
         integrationTestCoverageRootPath,
-        '-r',
-        'lcovonly',
-        `${integrationTestNycOutputPath}/*.json`
+        '--include', 
+        `${integrationTestNycOutputPath}/*.json`,
+        'lcovonly'
     ], {
         cwd: codeExtensionSourcesPath
     });
 });
 
 gulp.task("cov:merge-html", async () => {
     return spawnNode([
-        istanbulCombinePath,
-        '-d',
+        istanbulPath,
+        'report',
+        '--dir',
         integrationTestCoverageRootPath,
-        '-r',
-        'html',
-        `${integrationTestNycOutputPath}/*.json`
+        '--include', 
+        `${integrationTestNycOutputPath}/*.json`,
+        'html'
     ], {
         cwd: codeExtensionSourcesPath
     });

diff --git a/tasks/projectPaths.ts b/tasks/projectPaths.ts
@@ -18,7 +18,7 @@ export const nodeModulesPath = path.join(rootPath, 'node_modules');
 export const vscePath = path.join(nodeModulesPath, 'vsce', 'out', 'vsce');
 export const nycPath = path.join(nodeModulesPath, 'nyc', 'bin', 'nyc.js');
 export const mochaPath = path.join(nodeModulesPath, 'mocha', 'bin', 'mocha');
-export const istanbulCombinePath = path.join(nodeModulesPath, 'istanbul-combine', 'cli.js');
+export const istanbulPath = path.join(nodeModulesPath, 'istanbul', 'lib', 'cli.js');
 export const codecovPath = path.join(nodeModulesPath, 'codecov', 'bin', 'codecov');
 export const vscodeTestHostPath = path.join(nodeModulesPath, 'vscode', 'bin', 'test');