1 files changed, 98 insertions, 112 deletions
diff --git a/deps/npm/test/tap/install-save-prefix.js b/deps/npm/test/tap/install-save-prefix.js
index 001e24d873..d61608e1cf 100644
--- a/deps/npm/test/tap/install-save-prefix.js
+++ b/deps/npm/test/tap/install-save-prefix.js
@@ -1,14 +1,11 @@
 var fs = require('fs')
 var path = require('path')
 
-var mkdirp = require('mkdirp')
 var mr = require('npm-registry-mock')
-var osenv = require('osenv')
 var rimraf = require('rimraf')
 var test = require('tap').test
 
 var common = require('../common-tap.js')
-var server
 
 var pkg = common.pkg
 
@@ -19,17 +16,18 @@ var json = {
   version: '0.0.1'
 }
 
-test('setup', function (t) {
-  setup()
+test('start mock reg', function (t) {
   mr({ port: common.port }, function (er, s) {
     t.ifError(er, 'started mock registry')
-    server = s
+    t.parent.teardown(() => s.close())
     t.end()
   })
 })
 
 test('install --save with \'^\' save prefix should accept minor updates', function (t) {
-  common.npm(
+  t.plan(2)
+  t.test('setup', setup)
+  t.test('run test', t => common.npm(
     [
       '--registry', common.registry,
       '--loglevel', 'silent',
@@ -37,31 +35,30 @@ test('install --save with \'^\' save prefix should accept minor updates', functi
       '--save',
       'install', 'underscore@latest'
     ],
-    EXEC_OPTS,
-    function (err, code) {
-      t.ifError(err, 'npm install ran without issue')
-      t.notOk(code, 'npm install exited with code 0')
-
-      var p = path.join(pkg, 'node_modules', 'underscore', 'package.json')
-      t.ok(JSON.parse(fs.readFileSync(p)))
-
-      var pkgJson = JSON.parse(fs.readFileSync(
-        path.join(pkg, 'package.json'),
-        'utf8'
-      ))
-      t.deepEqual(
-        pkgJson.dependencies,
-        { 'underscore': '^1.5.1' },
-        'got expected save prefix and version of 1.5.1'
-      )
-      t.end()
-    }
-  )
+    EXEC_OPTS
+  ).then(([code]) => {
+    console.error('back from install!', code)
+    t.equal(code, 0, 'npm install exited with code 0')
+
+    var p = path.join(pkg, 'node_modules', 'underscore', 'package.json')
+    t.ok(JSON.parse(fs.readFileSync(p)))
+
+    var pkgJson = JSON.parse(fs.readFileSync(
+      path.join(pkg, 'package.json'),
+      'utf8'
+    ))
+    t.deepEqual(
+      pkgJson.dependencies,
+      { 'underscore': '^1.5.1' },
+      'got expected save prefix and version of 1.5.1'
+    )
+  }))
 })
 
 test('install --save-dev with \'^\' save prefix should accept minor dev updates', function (t) {
-  setup()
-  common.npm(
+  t.plan(2)
+  t.test('setup', setup)
+  t.test('run test', t => common.npm(
     [
       '--registry', common.registry,
       '--loglevel', 'silent',
@@ -69,31 +66,30 @@ test('install --save-dev with \'^\' save prefix should accept minor dev updates'
       '--save-dev',
       'install', 'underscore@1.3.1'
     ],
-    EXEC_OPTS,
-    function (err, code) {
-      t.ifError(err, 'npm install ran without issue')
-      t.notOk(code, 'npm install exited with code 0')
-
-      var p = path.join(pkg, 'node_modules', 'underscore', 'package.json')
-      t.ok(JSON.parse(fs.readFileSync(p)))
-
-      var pkgJson = JSON.parse(fs.readFileSync(
-        path.join(pkg, 'package.json'),
-        'utf8'
-      ))
-      t.deepEqual(
-        pkgJson.devDependencies,
-        { 'underscore': '^1.3.1' },
-        'got expected save prefix and version of 1.3.1'
-      )
-      t.end()
-    }
-  )
+    EXEC_OPTS
+  ).then(([code]) => {
+    t.equal(code, 0, 'npm install exited with code 0')
+
+    var p = path.join(pkg, 'node_modules', 'underscore', 'package.json')
+    t.ok(JSON.parse(fs.readFileSync(p)))
+
+    var pkgJson = JSON.parse(fs.readFileSync(
+      path.join(pkg, 'package.json'),
+      'utf8'
+    ))
+    t.deepEqual(
+      pkgJson.devDependencies,
+      { 'underscore': '^1.3.1' },
+      'got expected save prefix and version of 1.3.1'
+    )
+    t.end()
+  }))
 })
 
 test('install --save with \'~\' save prefix should accept patch updates', function (t) {
-  setup()
-  common.npm(
+  t.plan(2)
+  t.test('setup', setup)
+  t.test('run test', t => common.npm(
     [
       '--registry', common.registry,
       '--loglevel', 'silent',
@@ -101,31 +97,29 @@ test('install --save with \'~\' save prefix should accept patch updates', functi
       '--save',
       'install', 'underscore@1.3.1'
     ],
-    EXEC_OPTS,
-    function (err, code) {
-      t.ifError(err, 'npm install ran without issue')
-      t.notOk(code, 'npm install exited with code 0')
-
-      var p = path.join(pkg, 'node_modules', 'underscore', 'package.json')
-      t.ok(JSON.parse(fs.readFileSync(p)))
-
-      var pkgJson = JSON.parse(fs.readFileSync(
-        path.join(pkg, 'package.json'),
-        'utf8'
-      ))
-      t.deepEqual(
-        pkgJson.dependencies,
-        { 'underscore': '~1.3.1' },
-        'got expected save prefix and version of 1.3.1'
-      )
-      t.end()
-    }
-  )
+    EXEC_OPTS
+  ).then(([code]) => {
+    t.equal(code, 0, 'npm install exited with code 0')
+
+    var p = path.join(pkg, 'node_modules', 'underscore', 'package.json')
+    t.ok(JSON.parse(fs.readFileSync(p)))
+
+    var pkgJson = JSON.parse(fs.readFileSync(
+      path.join(pkg, 'package.json'),
+      'utf8'
+    ))
+    t.deepEqual(
+      pkgJson.dependencies,
+      { 'underscore': '~1.3.1' },
+      'got expected save prefix and version of 1.3.1'
+    )
+  }))
 })
 
 test('install --save-dev with \'~\' save prefix should accept patch updates', function (t) {
-  setup()
-  common.npm(
+  t.plan(2)
+  t.test('setup', setup)
+  t.test('run test', t => common.npm(
     [
       '--registry', common.registry,
       '--loglevel', 'silent',
@@ -133,46 +127,38 @@ test('install --save-dev with \'~\' save prefix should accept patch updates', fu
       '--save-dev',
       'install', 'underscore@1.3.1'
     ],
-    EXEC_OPTS,
-    function (err, code) {
-      t.ifError(err, 'npm install ran without issue')
-      t.notOk(code, 'npm install exited with code 0')
-
-      var p = path.join(pkg, 'node_modules', 'underscore', 'package.json')
-      t.ok(JSON.parse(fs.readFileSync(p)))
-
-      var pkgJson = JSON.parse(fs.readFileSync(
-        path.join(pkg, 'package.json'),
-        'utf8'
-      ))
-      t.deepEqual(
-        pkgJson.devDependencies,
-        { 'underscore': '~1.3.1' },
-        'got expected save prefix and version of 1.3.1'
-      )
-      t.end()
-    }
-  )
+    EXEC_OPTS
+  ).then(([code]) => {
+    t.notOk(code, 'npm install exited with code 0')
+
+    var p = path.join(pkg, 'node_modules', 'underscore', 'package.json')
+    t.ok(JSON.parse(fs.readFileSync(p)))
+
+    var pkgJson = JSON.parse(fs.readFileSync(
+      path.join(pkg, 'package.json'),
+      'utf8'
+    ))
+    t.deepEqual(
+      pkgJson.devDependencies,
+      { 'underscore': '~1.3.1' },
+      'got expected save prefix and version of 1.3.1'
+    )
+  }))
 })
 
-test('cleanup', function (t) {
-  server.close()
-  cleanup()
-  t.end()
-})
-
-function cleanup () {
-  process.chdir(osenv.tmpdir())
-  rimraf.sync(pkg)
-}
-
-function setup () {
-  cleanup()
-  mkdirp.sync(path.resolve(pkg, 'node_modules'))
-  fs.writeFileSync(
-    path.join(pkg, 'package.json'),
-    JSON.stringify(json, null, 2)
-  )
+function setup (t) {
+  t.test('destroy', t => {
+    t.plan(2)
+    rimraf(path.resolve(pkg, 'node_modules'), () => t.pass('node_modules'))
+    rimraf(path.resolve(pkg, 'pacakage-lock.json'), () => t.pass('lock file'))
+  })
+  t.test('create', t => {
+    fs.writeFileSync(
+      path.join(pkg, 'package.json'),
+      JSON.stringify(json, null, 2)
+    )
+    t.end()
+  })
 
-  process.chdir(pkg)
+  t.end()
 }