chore: Improve self-coverage collection. (#1027)

istanbuljs · Mar 13, 2019 · 364eb33 · 364eb33
1 parent d8f28e9
commit 364eb33
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/test/fixtures/_generateReport.js b/test/fixtures/_generateReport.js
@@ -10,7 +10,7 @@ var _ = require('lodash')
 var rimraf = require('rimraf')
 var sourceMapFixtures = require('source-map-fixtures')
 
-var NYC = require('../../')
+var NYC = require('../../self-coverage')
 
 // Load source map fixtures.
 var fixtures = {

diff --git a/test/nyc-index.js b/test/nyc-index.js
@@ -2,17 +2,12 @@
 
 require('source-map-support').install({ hookRequire: true })
 
+const fs = require('fs')
 const _ = require('lodash')
 const ap = require('any-path')
-const configUtil = require('../lib/config-util')
-const fs = require('fs')
 
-let NYC
-try {
-  NYC = require('../index.covered.js')
-} catch (e) {
-  NYC = require('../')
-}
+const configUtil = require('../self-coverage/lib/config-util')
+const NYC = require('../self-coverage')
 // we test exit handlers in nyc-integration.js.
 NYC.prototype._wrapExit = () => {}
 
@@ -21,12 +16,14 @@ const rimraf = require('rimraf')
 const isWindows = require('is-windows')()
 const spawn = require('child_process').spawn
 const fixtures = path.resolve(__dirname, './fixtures')
-const bin = path.resolve(__dirname, '../bin/nyc')
+const bin = path.resolve(__dirname, '../self-coverage/bin/nyc')
 const resetState = require('./lib/reset-state')
 
 require('chai').should()
 require('tap').mochaGlobals()
 
+const transpileHook = path.resolve(process.cwd(), './test/fixtures/transpile-hook')
+
 describe('nyc', function () {
   beforeEach(resetState)
 
@@ -392,7 +389,7 @@ describe('nyc', function () {
         'utf-8'
       )
 
-      var nyc = (new NYC(configUtil.buildYargs(fixtures).parse(['--require', './test/fixtures/transpile-hook'])))
+      var nyc = (new NYC(configUtil.buildYargs(fixtures).parse(['--require', transpileHook])))
       nyc.reset()
       nyc.addAllFiles()
 
@@ -418,7 +415,7 @@ describe('nyc', function () {
       )
 
       var nyc = (new NYC(configUtil.buildYargs(fixtures).parse([
-        '--require=./test/fixtures/transpile-hook',
+        `--require=${transpileHook}`,
         '--extension=.do-not-transpile',
         '--include=needs-transpile.do-not-transpile'
       ])))
@@ -438,7 +435,7 @@ describe('nyc', function () {
     )
 
     var nyc = (new NYC(configUtil.buildYargs(fixtures).parse([
-      '--require=./test/fixtures/transpile-hook',
+      `--require=${transpileHook}`,
       '--extension=.whatever'
     ])))
 

diff --git a/test/process-args.js b/test/process-args.js
@@ -3,7 +3,7 @@
 require('chai').should()
 require('tap').mochaGlobals()
 
-const processArgs = require('../lib/process-args')
+const processArgs = require('../self-coverage/lib/process-args')
 
 describe('process-args', function () {
   describe('hideInstrumenterArgs', function () {

diff --git a/test/src/nyc-tap.js b/test/src/nyc-tap.js
@@ -2,12 +2,12 @@
 
 require('source-map-support').install({ hookRequire: true })
 
+const fs = require('fs')
 const _ = require('lodash')
 const ap = require('any-path')
-const configUtil = require('../../lib/config-util')
-const fs = require('fs')
 const enableCache = false
 
+const configUtil = require('../../self-coverage/lib/config-util')
 const _NYC = require('../../self-coverage')
 
 function NYC (opts) {