1 files changed, 116 insertions, 130 deletions
diff --git a/deps/npm/test/tap/install-save-local.js b/deps/npm/test/tap/install-save-local.js
index 8f4f5ecb00..8b65979528 100644
--- a/deps/npm/test/tap/install-save-local.js
+++ b/deps/npm/test/tap/install-save-local.js
@@ -2,7 +2,6 @@ var fs = require('graceful-fs')
 var path = require('path')
 
 var mkdirp = require('mkdirp')
-var osenv = require('osenv')
 var rimraf = require('rimraf')
 var test = require('tap').test
 
@@ -28,168 +27,155 @@ var localDevDependency = {
   version: '0.0.0'
 }
 
-test('setup', function (t) {
-  setup()
+test('setup deps in root', t => {
+  mkdirp.sync(path.join(root, 'package-local-dependency'))
+  fs.writeFileSync(
+    path.join(root, 'package-local-dependency', 'package.json'),
+    JSON.stringify(localDependency, null, 2)
+  )
+
+  mkdirp.sync(path.join(root, 'package-local-dev-dependency'))
+  fs.writeFileSync(
+    path.join(root, 'package-local-dev-dependency', 'package.json'),
+    JSON.stringify(localDevDependency, null, 2)
+  )
+
   t.end()
 })
 
 test('\'npm install --save ../local/path\' should save to package.json', function (t) {
-  common.npm(
+  t.plan(2)
+  t.test('setup', setup)
+  t.test('run test', t => common.npm(
     [
       '--loglevel', 'silent',
       '--save',
       'install', '../package-local-dependency'
     ],
-    EXEC_OPTS,
-    function (err, code) {
-      t.ifError(err, 'npm install ran without issue')
-      t.notOk(code, 'npm install exited with code 0')
-
-      var dependencyPackageJson = path.join(
-        pkg, 'node_modules', 'package-local-dependency', 'package.json'
-      )
-      t.ok(JSON.parse(fs.readFileSync(dependencyPackageJson, 'utf8')))
-
-      var pkgJson = JSON.parse(fs.readFileSync(pkg + '/package.json', 'utf8'))
-      t.is(Object.keys(pkgJson.dependencies).length, 1, 'only one dep')
-      t.ok(
-        /file:.*?[/]package-local-dependency$/.test(pkgJson.dependencies['package-local-dependency']),
-        'local package saved correctly'
-      )
-      t.end()
-    }
-  )
+    EXEC_OPTS
+  ).then(([code]) => {
+    t.equal(code, 0, 'npm install exited with code 0')
+
+    var dependencyPackageJson = path.join(
+      pkg, 'node_modules', 'package-local-dependency', 'package.json'
+    )
+    t.ok(JSON.parse(fs.readFileSync(dependencyPackageJson, 'utf8')))
+
+    var pkgJson = JSON.parse(fs.readFileSync(pkg + '/package.json', 'utf8'))
+    t.is(Object.keys(pkgJson.dependencies).length, 1, 'only one dep')
+    t.ok(
+      /file:.*?[/]package-local-dependency$/.test(pkgJson.dependencies['package-local-dependency']),
+      'local package saved correctly'
+    )
+  }))
 })
 
 test('\'npm install --save local/path\' should save to package.json', function (t) {
-  setup()
-  common.npm(
+  t.plan(2)
+  t.test('setup', setup)
+  t.test('run test', t => common.npm(
     [
       '--loglevel', 'silent',
       '--save',
       'install', 'package-local-dependency/'
     ],
-    EXEC_OPTS,
-    function (err, code) {
-      t.ifError(err, 'npm install ran without issue')
-      t.notOk(code, 'npm install exited with code 0')
-
-      var dependencyPackageJson = path.join(
-        pkg, 'node_modules', 'package-local-dependency', 'package.json'
-      )
-      t.ok(JSON.parse(fs.readFileSync(dependencyPackageJson, 'utf8')))
-
-      var pkgJson = JSON.parse(fs.readFileSync(pkg + '/package.json', 'utf8'))
-      t.is(Object.keys(pkgJson.dependencies).length, 1, 'only one dep')
-      t.ok(
-        /file:package-local-dependency$/.test(pkgJson.dependencies['package-local-dependency']),
-        'local package saved correctly'
-      )
-      t.end()
-    }
-  )
+    EXEC_OPTS
+  ).then(([code, out, err]) => {
+    t.equal(code, 0, 'npm install exited with code 0')
+
+    var dependencyPackageJson = path.join(
+      pkg, 'node_modules', 'package-local-dependency', 'package.json'
+    )
+    t.ok(JSON.parse(fs.readFileSync(dependencyPackageJson, 'utf8')))
+
+    var pkgJson = JSON.parse(fs.readFileSync(pkg + '/package.json', 'utf8'))
+    t.is(Object.keys(pkgJson.dependencies).length, 1, 'only one dep')
+    t.ok(
+      /file:package-local-dependency$/.test(pkgJson.dependencies['package-local-dependency']),
+      'local package saved correctly'
+    )
+  }))
 })
 
 test('\'npm install --save-dev ../local/path\' should save to package.json', function (t) {
-  setup()
-  common.npm(
+  t.plan(2)
+  t.test('setup', setup)
+  t.test('run test', t => common.npm(
     [
       '--loglevel', 'silent',
       '--save-dev',
       'install', '../package-local-dev-dependency'
     ],
-    EXEC_OPTS,
-    function (err, code) {
-      t.ifError(err, 'npm install ran without issue')
-      t.notOk(code, 'npm install exited with code 0')
-
-      var dependencyPackageJson = path.resolve(
-        pkg, 'node_modules', 'package-local-dev-dependency', 'package.json'
-      )
-      t.ok(JSON.parse(fs.readFileSync(dependencyPackageJson, 'utf8')))
-
-      var pkgJson = JSON.parse(fs.readFileSync(pkg + '/package.json', 'utf8'))
-      t.is(Object.keys(pkgJson.devDependencies).length, 1, 'only one dep')
-      t.ok(
-        /file:.*?[/\\]package-local-dev-dependency$/.test(pkgJson.devDependencies['package-local-dev-dependency']),
-        'local package saved correctly'
-      )
-
-      t.end()
-    }
-  )
+    EXEC_OPTS
+  ).then(([code]) => {
+    t.equal(code, 0, 'npm install exited with code 0')
+
+    var dependencyPackageJson = path.resolve(
+      pkg, 'node_modules', 'package-local-dev-dependency', 'package.json'
+    )
+    t.ok(JSON.parse(fs.readFileSync(dependencyPackageJson, 'utf8')))
+
+    var pkgJson = JSON.parse(fs.readFileSync(pkg + '/package.json', 'utf8'))
+    t.is(Object.keys(pkgJson.devDependencies).length, 1, 'only one dep')
+    t.ok(
+      /file:.*?[/\\]package-local-dev-dependency$/.test(pkgJson.devDependencies['package-local-dev-dependency']),
+      'local package saved correctly'
+    )
+
+    t.end()
+  }))
 })
+
 test('\'npm install --save-dev local/path\' should save to package.json', function (t) {
-  setup()
-  common.npm(
+  t.plan(2)
+  t.test('setup', setup)
+  t.test('run test', t => common.npm(
     [
       '--loglevel', 'silent',
       '--save-dev',
       'install', 'package-local-dev-dependency/'
     ],
-    EXEC_OPTS,
-    function (err, code) {
-      t.ifError(err, 'npm install ran without issue')
-      t.notOk(code, 'npm install exited with code 0')
-
-      var dependencyPackageJson = path.resolve(
-        pkg, 'node_modules', 'package-local-dev-dependency', 'package.json'
-      )
-      t.ok(JSON.parse(fs.readFileSync(dependencyPackageJson, 'utf8')))
-
-      var pkgJson = JSON.parse(fs.readFileSync(pkg + '/package.json', 'utf8'))
-      t.is(Object.keys(pkgJson.devDependencies).length, 1, 'only one dep')
-      t.ok(
-        /file:package-local-dev-dependency$/.test(pkgJson.devDependencies['package-local-dev-dependency']),
-        'local package saved correctly'
-      )
-
-      t.end()
-    }
-  )
+    EXEC_OPTS
+  ).then(([code]) => {
+    t.equal(code, 0, 'npm install exited with code 0')
+
+    var dependencyPackageJson = path.resolve(
+      pkg, 'node_modules', 'package-local-dev-dependency', 'package.json'
+    )
+    t.ok(JSON.parse(fs.readFileSync(dependencyPackageJson, 'utf8')))
+
+    var pkgJson = JSON.parse(fs.readFileSync(pkg + '/package.json', 'utf8'))
+    t.is(Object.keys(pkgJson.devDependencies).length, 1, 'only one dep')
+    t.ok(
+      /file:package-local-dev-dependency$/.test(pkgJson.devDependencies['package-local-dev-dependency']),
+      'local package saved correctly'
+    )
+
+    t.end()
+  }))
 })
 
-test('cleanup', function (t) {
-  cleanup()
+function setup (t) {
+  t.test('destroy', t => rimraf(pkg, t.end))
+  t.test('create', t => {
+    mkdirp.sync(pkg)
+    fs.writeFileSync(
+      path.join(pkg, 'package.json'),
+      JSON.stringify(json, null, 2)
+    )
+
+    mkdirp.sync(path.join(pkg, 'package-local-dependency'))
+    fs.writeFileSync(
+      path.join(pkg, 'package-local-dependency', 'package.json'),
+      JSON.stringify(localDependency, null, 2)
+    )
+
+    mkdirp.sync(path.join(pkg, 'package-local-dev-dependency'))
+    fs.writeFileSync(
+      path.join(pkg, 'package-local-dev-dependency', 'package.json'),
+      JSON.stringify(localDevDependency, null, 2)
+    )
+    t.end()
+  })
   t.end()
-})
-
-function cleanup () {
-  process.chdir(osenv.tmpdir())
-  process.chdir(__dirname)
-  rimraf.sync(root)
-}
-
-function setup () {
-  cleanup()
-  mkdirp.sync(pkg)
-  fs.writeFileSync(
-    path.join(pkg, 'package.json'),
-    JSON.stringify(json, null, 2)
-  )
-
-  mkdirp.sync(path.join(root, 'package-local-dependency'))
-  fs.writeFileSync(
-    path.join(root, 'package-local-dependency', 'package.json'),
-    JSON.stringify(localDependency, null, 2)
-  )
-
-  mkdirp.sync(path.join(root, 'package-local-dev-dependency'))
-  fs.writeFileSync(
-    path.join(root, 'package-local-dev-dependency', 'package.json'),
-    JSON.stringify(localDevDependency, null, 2)
-  )
-
-  mkdirp.sync(path.join(pkg, 'package-local-dependency'))
-  fs.writeFileSync(
-    path.join(pkg, 'package-local-dependency', 'package.json'),
-    JSON.stringify(localDependency, null, 2)
-  )
-
-  mkdirp.sync(path.join(pkg, 'package-local-dev-dependency'))
-  fs.writeFileSync(
-    path.join(pkg, 'package-local-dev-dependency', 'package.json'),
-    JSON.stringify(localDevDependency, null, 2)
-  )
-  process.chdir(pkg)
 }