test: extraneous deps in legacy shrinkwraps are not installed

2 files changed, 17 insertions, 12 deletions

diff --git a/test/tap/bearer-token-check.js b/test/tap/bearer-token-check.js
index 42c8f313e..23870d2f2 100644
--- a/test/tap/bearer-token-check.js
+++ b/test/tap/bearer-token-check.js
@@ -89,7 +89,10 @@ var contents = '@scoped:registry=' + common.registry + '\n' +
 
 var json = {
   name: 'test-package-install',
-  version: '1.0.0'
+  version: '1.0.0',
+  dependencies: {
+    '@scoped/underscore': '1.3.1'
+  }
 }
 
 var shrinkwrap = {
diff --git a/test/tap/shrinkwrap-scoped-auth.js b/test/tap/shrinkwrap-scoped-auth.js
index 6d5130137..bd884c00b 100644
--- a/test/tap/shrinkwrap-scoped-auth.js
+++ b/test/tap/shrinkwrap-scoped-auth.js
@@ -1,4 +1,4 @@
-var resolve = require('path').resolve
+var path = require('path')
 var writeFileSync = require('graceful-fs').writeFileSync
 
 var mkdirp = require('mkdirp')
@@ -10,12 +10,12 @@ var test = require('tap').test
 var common = require('../common-tap.js')
 var toNerfDart = require('../../lib/config/nerf-dart.js')
 
-var pkg = resolve(__dirname, 'shrinkwrap-scoped-auth')
-var outfile = resolve(pkg, '_npmrc')
-var modules = resolve(pkg, 'node_modules')
+var pkg = path.resolve(__dirname, path.basename(__filename, '.js'))
+var outfile = path.resolve(pkg, '_npmrc')
+var modules = path.resolve(pkg, 'node_modules')
 var tarballPath = '/scoped-underscore/-/scoped-underscore-1.3.1.tgz'
 var tarballURL = common.registry + tarballPath
-var tarball = resolve(__dirname, '../fixtures/scoped-underscore-1.3.1.tgz')
+var tarball = path.resolve(__dirname, '../fixtures/scoped-underscore-1.3.1.tgz')
 
 var server
 
@@ -46,10 +46,9 @@ test('authed npm install with shrinkwrapped scoped package', function (t) {
       '--fetch-retries', 0,
       '--userconfig', outfile
     ],
-    {cwd: pkg},
-    function (err, code, stdout, stderr) {
+    {cwd: pkg, stdio: [0, 'pipe', 2]},
+    function (err, code, stdout) {
       if (err) throw err
-      if (stderr) t.comment(stderr)
       t.equal(code, 0, 'npm install exited OK')
       try {
         var results = JSON.parse(stdout)
@@ -75,7 +74,10 @@ var contents = '@scoped:registry=' + common.registry + '\n' +
 
 var json = {
   name: 'test-package-install',
-  version: '1.0.0'
+  version: '1.0.0',
+  dependencies: {
+    '@scoped/underscore': '1.0.0'
+  }
 }
 
 var shrinkwrap = {
@@ -93,10 +95,10 @@ var shrinkwrap = {
 function setup () {
   cleanup()
   mkdirp.sync(modules)
-  writeFileSync(resolve(pkg, 'package.json'), JSON.stringify(json, null, 2) + '\n')
+  writeFileSync(path.resolve(pkg, 'package.json'), JSON.stringify(json, null, 2) + '\n')
   writeFileSync(outfile, contents)
   writeFileSync(
-    resolve(pkg, 'npm-shrinkwrap.json'),
+    path.resolve(pkg, 'npm-shrinkwrap.json'),
     JSON.stringify(shrinkwrap, null, 2) + '\n'
   )
 }