Iarna/concurrent tests

doc/spec/file-specifiers.md

@@ -55,9 +55,6 @@ note for the `npm-shrinkwrap.json` as it means the specifier there will
 be different then the original `package.json` (where it was relative to that
 `package.json`).
 
-# No, for `file:` type specifiers, we SHOULD shrinkwrap.  Other symlinks we
-# should not. Other symlinks w/o the link spec should be an error.
-
 When shrinkwrapping file specifiers, the contents of the destination
 package's `node_modules` WILL NOT be included in the shrinkwrap. If you want to lock
 down the destination package's `node_modules` you should create a shrinkwrap for it

package.json

@@ -281,7 +281,7 @@
     "tap-cover": "tap --reporter=classic --nyc-arg='--cache' --coverage --timeout 600",
     "test": "standard && npm run test-tap",
     "test-coverage": "npm run tap-cover -- \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-*/*.js\"",
-    "test-tap": "npm run tap -- \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-*/*.js\"",
+    "test-tap": "npm run tap -- \"test/unit/*.js\" \"test/integration/*.js\" \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-*/*.js\"",
     "test-node": "tap --timeout 240 \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-nyc*/*.js\""
   },
   "license": "Artistic-2.0"

test/tap/00-config-setup.js → test/00-config-setup.js

@@ -1,10 +1,10 @@
 var fs = require('graceful-fs')
 var path = require('path')
-var userconfigSrc = path.resolve(__dirname, '..', 'fixtures', 'config', 'userconfig')
+var userconfigSrc = path.resolve(__dirname, 'fixtures', 'config', 'userconfig')
 exports.userconfig = userconfigSrc + '-with-gc'
-exports.globalconfig = path.resolve(__dirname, '..', 'fixtures', 'config', 'globalconfig')
-exports.builtin = path.resolve(__dirname, '..', 'fixtures', 'config', 'builtin')
-exports.malformed = path.resolve(__dirname, '..', 'fixtures', 'config', 'malformed')
+exports.globalconfig = path.resolve(__dirname, 'fixtures', 'config', 'globalconfig')
+exports.builtin = path.resolve(__dirname, 'fixtures', 'config', 'builtin')
+exports.malformed = path.resolve(__dirname, 'fixtures', 'config', 'malformed')
 exports.ucData =
   { globalconfig: exports.globalconfig,
     email: 'i@izs.me',
@@ -55,7 +55,7 @@ exports.envDataFix = {
   'other-env-thing': 1000
 }
 
-var projectConf = path.resolve(__dirname, '..', '..', '.npmrc')
+var projectConf = path.resolve(__dirname, '..', '.npmrc')
 try {
   fs.statSync(projectConf)
 } catch (er) {
@@ -66,7 +66,7 @@ legacy-bundling = true
   */ }.toString().split('\n').slice(1, -1).join('\n'))
 }
 
-var projectRc = path.join(__dirname, '..', 'fixtures', 'config', '.npmrc')
+var projectRc = path.join(__dirname, 'fixtures', 'config', '.npmrc')
 try {
   fs.statSync(projectRc)
 } catch (er) {

test/tap/config-basic.js → test/integration/config-basic.js

@@ -1,6 +1,6 @@
 var test = require('tap').test
 var npmconf = require('../../lib/config/core.js')
-var common = require('./00-config-setup.js')
+var common = require('../00-config-setup.js')
 var path = require('path')
 
 var projectData = {

test/tap/config-builtin.js → test/integration/config-builtin.js

@@ -1,6 +1,6 @@
 var test = require('tap').test
 var npmconf = require('../../lib/config/core.js')
-var common = require('./00-config-setup.js')
+var common = require('../00-config-setup.js')
 var path = require('path')
 
 var ucData = common.ucData

test/tap/config-certfile.js → test/integration/config-certfile.js

@@ -1,4 +1,4 @@
-require('./00-config-setup.js')
+require('../00-config-setup.js')
 
 var path = require('path')
 var fs = require('fs')

test/tap/config-credentials.js → test/integration/config-credentials.js

@@ -1,7 +1,7 @@
 var test = require('tap').test
 
 var npmconf = require('../../lib/config/core.js')
-var common = require('./00-config-setup.js')
+var common = require('../00-config-setup.js')
 
 var URI = 'https://registry.lvh.me:8661/'
 

test/tap/config-malformed.js → test/integration/config-malformed.js

@@ -1,7 +1,7 @@
 var test = require('tap').test
 
 var npmconf = require('../../lib/config/core.js')
-var common = require('./00-config-setup.js')
+var common = require('../00-config-setup.js')
 
 test('with malformed', function (t) {
   npmconf.load({}, common.malformed, function (er, conf) {

test/tap/config-new-cafile.js → test/integration/config-new-cafile.js

@@ -1,4 +1,4 @@
-require('./00-config-setup.js')
+require('../00-config-setup.js')
 
 var path = require('path')
 var fs = require('graceful-fs')

test/tap/config-project.js → test/integration/config-project.js

@@ -3,7 +3,7 @@ var path = require('path')
 var fix = path.resolve(__dirname, '..', 'fixtures', 'config')
 var projectRc = path.resolve(fix, '.npmrc')
 var npmconf = require('../../lib/config/core.js')
-var common = require('./00-config-setup.js')
+var common = require('../00-config-setup.js')
 
 var projectData = { just: 'testing' }
 

test/tap/config-save.js → test/integration/config-save.js

@@ -2,7 +2,7 @@ var fs = require('fs')
 var ini = require('ini')
 var test = require('tap').test
 var npmconf = require('../../lib/config/core.js')
-var common = require('./00-config-setup.js')
+var common = require('../00-config-setup.js')
 
 var expectConf = [
   'globalconfig = ' + common.globalconfig,

test/tap/version-sub-directory-shrinkwrap.js → test/integration/version-sub-directory-shrinkwrap.js

@@ -9,7 +9,7 @@ var test = require('tap').test
 
 var npm = require('../../lib/npm.js')
 
-var pkg = path.resolve(__dirname, 'version-sub-directory')
+var pkg = path.resolve(__dirname, path.basename(__filename, '.js'))
 var subDirectory = path.resolve(pkg, 'sub-directory')
 var packagePath = path.resolve(pkg, 'package.json')
 var shrinkwrapPath = path.resolve(pkg, 'npm-shrinkwrap.json')

test/tap/version-sub-directory.js → test/integration/version-sub-directory.js

@@ -9,7 +9,7 @@ var test = require('tap').test
 
 var npm = require('../../lib/npm.js')
 
-var pkg = path.resolve(__dirname, 'version-sub-directory')
+var pkg = path.resolve(__dirname, path.basename(__filename, '.js'))
 var subDirectory = path.resolve(pkg, 'sub-directory')
 var packagePath = path.resolve(pkg, 'package.json')
 var cache = path.resolve(pkg, 'cache')

test/tap/zz-cleanup.js → test/zz-cleanup.js

@@ -1,4 +1,4 @@
-var common = require('../common-tap')
+var common = require('./common-tap')
 var test = require('tap').test
 var rimraf = require('rimraf')