test: more affordances for Windows

PR-URL: #1509
Credit: @isaacs
Close: #1509
Reviewed-by: @ruyadorno

Author: isaacs

lib/npm.js

@@ -243,7 +243,7 @@ const npm = module.exports = new class extends EventEmitter {
   }
 
   get localDir () {
-    return resolve(this.prefix, 'node_modules')
+    return resolve(this.localPrefix, 'node_modules')
   }
 
   get dir () {

test/lib/install.js

@@ -109,7 +109,8 @@ test('completion to folder', (t) => {
     partialWord: '/ar'
   }, (er, res) => {
     t.equal(er, null)
-    t.strictSame(res, ['/arborist'], 'package dir match')
+    const expect = process.platform === 'win32' ? '\\arborist' : '/arborist'
+    t.strictSame(res, [expect], 'package dir match')
     t.end()
   })
 })

test/lib/ls.js

@@ -1,8 +1,10 @@
 const { resolve } = require('path')
 
-const { test } = require('tap')
+const t = require('tap')
 const requireInject = require('require-inject')
 
+t.cleanSnapshot = str => str.split(/\r\n/).join('\n')
+
 const simpleNmFixture = {
   node_modules: {
     'foo': {
@@ -114,17 +116,16 @@ const ls = requireInject('../../lib/ls.js', {
 })
 
 const redactCwd = res =>
-  res && res.replace(/\\/g, '/').replace(new RegExp(__dirname.replace(/\\/g, '/'), 'gi'), '{CWD}')
+  res && res.replace(/\\+/g, '/').replace(new RegExp(__dirname.replace(/\\+/g, '/'), 'gi'), '{CWD}')
 
-const jsonParse = res =>
-  JSON.parse(redactCwd(res))
+const jsonParse = res => JSON.parse(redactCwd(res))
 
 const cleanUpResult = (done, t) => {
   result = ''
   done()
 }
 
-test('ls', (t) => {
+t.test('ls', (t) => {
   t.beforeEach(cleanUpResult)
   _flatOptions.json = false
   _flatOptions.unicode = false
@@ -423,7 +424,7 @@ test('ls', (t) => {
     ls([], (err) => {
       t.equal(err.code, 'ELSPROBLEMS', 'should have error code')
       t.equal(
-        redactCwd(err.message),
+        redactCwd(err.message).replace(/\r\n/g, '\n'),
         'invalid: foo@1.0.0 {CWD}/ls-ls-missing-invalid-extraneous/node_modules/foo\n' +
         'missing: ipsum@^1.0.0, required by test-npm-ls@1.0.0\n' +
         'extraneous: lorem@1.0.0 {CWD}/ls-ls-missing-invalid-extraneous/node_modules/lorem',
@@ -1334,7 +1335,7 @@ test('ls', (t) => {
   t.end()
 })
 
-test('ls --parseable', (t) => {
+t.test('ls --parseable', (t) => {
   t.beforeEach(cleanUpResult)
   _flatOptions.json = false
   _flatOptions.unicode = false
@@ -2128,7 +2129,7 @@ test('ls --parseable', (t) => {
   t.end()
 })
 
-test('ls --json', (t) => {
+t.test('ls --json', (t) => {
   t.beforeEach(cleanUpResult)
   _flatOptions.json = true
   _flatOptions.parseable = false

test/lib/npm.js

@@ -1,4 +1,5 @@
 const t = require('tap')
+const fs = require('fs')
 
 // delete this so that we don't have configs from the fact that it
 // is being run by 'npm test'
@@ -8,6 +9,8 @@ for (env of Object.keys(process.env).filter(e => /^npm_/.test(e))) {
 
 const { resolve } = require('path')
 
+const actualPlatform = process.platform
+
 const beWindows = () => {
   Object.defineProperty(process, 'platform', {
     value: 'win32',
@@ -126,7 +129,7 @@ t.test('npm.load', t => {
       ])
       logs.length = 0
 
-      t.equal(npm.cache, CACHE, 'cache is cache')
+      t.equal(resolve(npm.cache), resolve(CACHE), 'cache is cache')
       const newCache = t.testdir()
       npm.cache = newCache
       t.equal(npm.config.get('cache'), newCache, 'cache setter sets config')
@@ -152,10 +155,10 @@ t.test('npm.load', t => {
       npm.config.set('global', true)
       t.equal(npm.prefix, npm.globalPrefix, 'prefix is global prefix after setting global')
       t.notEqual(npm.prefix, npm.localPrefix, 'prefix is not local prefix after setting global')
-      t.equal(npm.bin, npm.globalBin, 'bin is global bin after prefix setter')
-      t.notEqual(npm.bin, npm.localBin, 'bin is not local bin after prefix setter')
-      t.equal(npm.dir, npm.globalDir, 'dir is global dir after prefix setter')
-      t.notEqual(npm.dir, npm.localDir, 'dir is not local dir after prefix setter')
+      t.equal(npm.bin, npm.globalBin, 'bin is global bin after setting global')
+      t.notEqual(npm.bin, npm.localBin, 'bin is not local bin after setting global')
+      t.equal(npm.dir, npm.globalDir, 'dir is global dir after setting global')
+      t.notEqual(npm.dir, npm.localDir, 'dir is not local dir after setting global')
 
       npm.prefix = dir + '/new/global/prefix'
       t.equal(npm.prefix, npm.globalPrefix, 'prefix is global prefix after prefix setter')
@@ -214,11 +217,14 @@ t.test('npm.load', t => {
   })
 
   t.test('node is a symlink', t => {
-    const node = process.platform === 'win32' ? 'node.exe' : 'node'
+    const node = actualPlatform === 'win32' ? 'node.exe' : 'node'
     const dir = t.testdir({
-      [node]: t.fixture('symlink', process.execPath),
       '.npmrc': 'foo = bar'
     })
+
+    // create manually to set the 'file' option in windows
+    fs.symlinkSync(process.execPath, resolve(dir, node), 'file')
+
     const PATH = process.env.PATH || process.env.Path
     process.env.PATH = dir
     const { execPath } = process

test/lib/utils/error-message.js

@@ -26,6 +26,7 @@ const bePosix = () => {
   delete require.cache[require.resolve('../../../lib/utils/is-windows.js')]
 }
 
+const { resolve } = require('path')
 const npm = require('../../../lib/npm.js')
 const CACHE = '/some/cache/dir'
 npm.config = {
@@ -257,9 +258,9 @@ t.test('json parse', t => {
     })
     Object.defineProperty(npm, 'prefix', { value: dir, configurable: true })
     process.argv = ['arg', 'v']
-    t.matchSnapshot(errorMessage(Object.assign(new Error('conflicted'), {
+    const ok = t.matchSnapshot(errorMessage(Object.assign(new Error('conflicted'), {
       code: 'EJSONPARSE',
-      file: `${dir}/package.json`
+      file: resolve(dir, 'package.json')
     })))
     t.end()
   })