Address review issues

All changed, so all this does now is propagate `cwd` so that it can influence `testExclude` and `require` path settings.
istanbuljs · Mar 19, 2019 · c454b56 · c454b56
1 parent 9822a8b
commit c454b56
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 47 deletions.
diff --git a/index.js b/index.js
@@ -179,15 +179,15 @@ NYC.prototype.addAllFiles = function () {
 NYC.prototype.instrumentAllFiles = function (input, output, cb) {
   let inputDir = '.' + path.sep
   const visitor = filename => {
-    const inFile = path.resolve(this.cwd, inputDir, filename)
+    const inFile = path.resolve(inputDir, filename)
     const inCode = fs.readFileSync(inFile, 'utf-8')
 
     const extname = path.extname(filename).toLowerCase()
     const transform = this.transforms[extname] || (code => code)
     const outCode = transform(inCode, { filename: inFile })
 
     if (output) {
-      const outFile = path.resolve(this.cwd, output, filename)
+      const outFile = path.resolve(output, filename)
       mkdirp.sync(path.dirname(outFile))
       fs.writeFileSync(outFile, outCode, 'utf-8')
     } else {
@@ -198,11 +198,10 @@ NYC.prototype.instrumentAllFiles = function (input, output, cb) {
   this._loadAdditionalModules()
 
   try {
-    const inputPath = path.resolve(this.cwd, input)
-    const stats = fs.lstatSync(inputPath)
+    const stats = fs.lstatSync(input)
     if (stats.isDirectory()) {
-      inputDir = inputPath
-      this.walkAllFiles(inputPath, visitor)
+      inputDir = input
+      this.walkAllFiles(input, visitor)
     } else {
       visitor(input)
     }

diff --git a/lib/commands/instrument.js b/lib/commands/instrument.js
@@ -7,7 +7,6 @@ exports.command = 'instrument <input> [output]'
 exports.describe = 'instruments a file or a directory tree and writes the instrumented code to the desired output location'
 
 exports.builder = function (yargs) {
-  const cwd = process.cwd()
   return yargs
     .option('require', {
       alias: 'i',
@@ -29,10 +28,6 @@ exports.builder = function (yargs) {
       type: 'boolean',
       description: "should nyc's instrumenter produce source maps?"
     })
-    .option('cwd', {
-      describe: 'working directory used when resolving paths',
-      default: cwd
-    })
     .option('compact', {
       default: true,
       type: 'boolean',

diff --git a/test/nyc-integration.js b/test/nyc-integration.js
@@ -606,42 +606,6 @@ describe('the nyc cli', function () {
         })
       })
 
-      it('works with a different working directory', function (done) {
-        const subdir = path.resolve(fixturesCLI, 'subdir')
-        const args = [bin, 'instrument', '--cwd', subdir, './input-dir', './output-dir']
-
-        const proc = spawn(process.execPath, args, {
-          cwd: fixturesCLI,
-          env: env
-        })
-
-        proc.on('exit', code => {
-          code.should.equal(0)
-          const target = path.resolve(subdir, 'output-dir', 'index.js')
-          fs.readFileSync(target, 'utf8')
-            .should.match(/console.log\('Hello, World!'\)/)
-          done()
-        })
-      })
-
-      it('works with a deep folder structure working directory', function (done) {
-        const subdir = path.resolve(fixturesCLI, 'subdir')
-        const args = [bin, 'instrument', '--cwd', subdir, '.', './output-dir']
-
-        const proc = spawn(process.execPath, args, {
-          cwd: fixturesCLI,
-          env: env
-        })
-
-        proc.on('exit', code => {
-          code.should.equal(0)
-          const target = path.resolve(subdir, 'output-dir', 'input-dir', 'index.js')
-          fs.readFileSync(target, 'utf8')
-            .should.match(/console.log\('Hello, World!'\)/)
-          done()
-        })
-      })
-
       it('can be configured to exit on error', function (done) {
         var args = [
           bin,