Remove networking requirements from many of our tests

package.json

@@ -213,7 +213,7 @@
     "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-node": "\"$NODE\" \"node_modules/.bin/tap\" --timeout 240 \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-nyc*/*.js\""
+    "test-node": "tap --timeout 240 \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-nyc*/*.js\""
   },
   "license": "Artistic-2.0"
 }

test/network/bearer-token-check.js → test/tap/bearer-token-check.js

@@ -15,7 +15,7 @@ var outfile = resolve(pkg, '_npmrc')
 var modules = resolve(pkg, 'node_modules')
 var tarballPath = '/scoped-underscore/-/scoped-underscore-1.3.1.tgz'
 // needs to be a different hostname to verify tokens (not) being sent correctly
-var tarballURL = 'http://lvh.me:' + common.port + tarballPath
+var tarballURL = 'http://127.0.0.1:' + common.port + tarballPath
 var tarball = resolve(__dirname, '../fixtures/scoped-underscore-1.3.1.tgz')
 
 var server
@@ -47,25 +47,27 @@ test('authed npm install with tarball not on registry', function (t) {
       '--loglevel', 'silent',
       '--json',
       '--fetch-retries', 0,
+      '--registry', common.registry,
       '--userconfig', outfile
     ],
     EXEC_OPTS,
     function (err, code, stdout, stderr) {
       t.ifError(err, 'test runner executed without error')
       t.equal(code, 0, 'npm install exited OK')
+      t.comment(stdout.trim())
+      t.comment(stderr.trim())
       t.notOk(stderr, 'no output on stderr')
       try {
         var results = JSON.parse(stdout)
       } catch (ex) {
-        console.error('#', ex)
         t.ifError(ex, 'stdout was valid JSON')
       }
 
       if (results) {
         var installedversion = {
           'version': '1.3.1',
           'from': '>=1.3.1 <2',
-          'resolved': 'http://lvh.me:1337/scoped-underscore/-/scoped-underscore-1.3.1.tgz'
+          'resolved': tarballURL
         }
         t.isDeeply(results.dependencies['@scoped/underscore'], installedversion, '@scoped/underscore installed')
       }

test/network/it.js → test/tap/it.js

@@ -35,7 +35,7 @@ test('run up the mock registry', function (t) {
 
 test('npm install-test', function (t) {
   setup()
-  common.npm('install-test', { cwd: pkg }, function (err, code, stdout, stderr) {
+  common.npm(['install-test', '--registry=' + common.registry], { cwd: pkg }, function (err, code, stdout, stderr) {
     if (err) throw err
     t.equal(code, 0, 'command ran without error')
     t.ok(statSync(installed), 'package was installed')
@@ -48,7 +48,7 @@ test('npm install-test', function (t) {
 
 test('npm it (the form most people will use)', function (t) {
   setup()
-  common.npm('it', { cwd: pkg }, function (err, code, stdout, stderr) {
+  common.npm(['it', '--registry=' + common.registry], { cwd: pkg }, function (err, code, stdout, stderr) {
     if (err) throw err
     t.equal(code, 0, 'command ran without error')
     t.ok(statSync(installed), 'package was installed')

test/network/legacy-optional-deps.js → test/tap/legacy-optional-deps.js

@@ -22,7 +22,7 @@ var fixture = new Tacks(
       name: 'npm-test-optional-deps',
       version: '1.2.5',
       optionalDependencies: {
-        'npm-test-foobarzaaakakaka': 'http://example.com/',
+        'npm-test-foobarzaaakakaka': common.registry + '/not-a-package',
         async: '10.999.14234',
         mkdirp: '0.3.5',
         optimist: 'some invalid version 99 #! $$ x y z',
@@ -45,6 +45,7 @@ test('setup', function (t) {
 
 test('optional-deps', function (t) {
   server.get('/npm-test-failer').reply(404, {error: 'nope'})
+  server.get('/not-a-package').reply(200, 'HI THERE')
 
   var opts = ['--registry=' + common.registry, '--timeout=100']
   common.npm(opts.concat(['install', fixturepath]), {cwd: basepath}, installCheckAndTest)

test/network/outdated-symlink.js → test/tap/outdated-symlink.js

@@ -15,7 +15,8 @@ var extend = Object.assign || require('util')._extend
 var fakeRoot = path.join(pkg, 'fakeRoot')
 var OPTS = {
   env: extend(extend({}, process.env), {
-    'npm_config_prefix': fakeRoot
+    'npm_config_prefix': fakeRoot,
+    'registry': common.registry
   })
 }