file-completion: Ensure that 'npm cache ls' outputs real filenames

isaacs · iarna · commit 37c6a51c71b0 · 2016-05-05T16:08:33.000-07:00
Credit: @isaacs Reviewed-By: @iarna PR-URL: #12150
diff --git a/lib/utils/completion/file-completion.js b/lib/utils/completion/file-completion.js
@@ -1,7 +1,6 @@
 module.exports = fileCompletion
 
 var mkdir = require('mkdirp')
-var path = require('path')
 var glob = require('glob')
 
 function fileCompletion (root, req, depth, cb) {
@@ -18,8 +17,7 @@ function fileCompletion (root, req, depth, cb) {
     glob(pattern, opts, function (er, files) {
       if (er) return cb(er)
       return cb(null, (files || []).map(function (f) {
-        var tail = f.substr(root.length + 1).replace(/^\//, '')
-        return path.join(req, tail)
+        return f.substr(root.length + 1).replace(/^\/|\/$/g, '')
       }))
     })
   })
diff --git a/test/tap/cache-ls-filenames.js b/test/tap/cache-ls-filenames.js
@@ -0,0 +1,51 @@
+var t = require('tap')
+var path = require('path')
+var fs = require('fs')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var spawn = require('child_process').spawn
+var npm = require.resolve('../../bin/npm-cli.js')
+var dir = path.resolve(__dirname, 'cache-ls-filenames')
+var node = process.execPath
+
+t.test('setup', function (t) {
+  rimraf.sync(dir)
+  mkdirp.sync(dir + '/a/b/c/d')
+  for (var i = 0; i < 5; i++) {
+    fs.writeFileSync(dir + '/file-' + i, 'x\n')
+    fs.writeFileSync(dir + '/a/b/file-' + i, 'x\n')
+  }
+  t.end()
+})
+
+function test (t, args) {
+  var child = spawn(node, [npm, 'cache', 'ls', '--cache=' + dir].concat(args))
+  var out = ''
+  child.stdout.on('data', function (c) {
+    out += c
+  })
+  child.on('close', function (code, signal) {
+    t.equal(code, 0)
+    t.equal(signal, null)
+    out.trim().split(/[\n\r]+/).map(function (filename) {
+      return filename.replace(/^~/, process.env.HOME)
+    }).forEach(function (file) {
+      // verify that all exist
+      t.ok(fs.existsSync(file), 'exists: ' + file)
+    })
+    t.end()
+  })
+}
+
+t.test('without path arg', function (t) {
+  test(t, [])
+})
+
+t.test('with path arg', function (t) {
+  test(t, ['a'])
+})
+
+t.test('cleanup', function (t) {
+  rimraf.sync(dir)
+  t.end()
+})
