deps: upgrade npm to 2.8.3

1 files changed, 77 insertions, 46 deletions

diff --git a/deps/npm/test/tap/outdated-long.js b/deps/npm/test/tap/outdated-long.js
index db011ab655..87e1f23b21 100644
--- a/deps/npm/test/tap/outdated-long.js
+++ b/deps/npm/test/tap/outdated-long.js
@@ -1,70 +1,101 @@
-var path = require("path")
+var fs = require('graceful-fs')
+var path = require('path')
 
-var mr = require("npm-registry-mock")
-var rimraf = require("rimraf")
-var test = require("tap").test
+var mkdirp = require('mkdirp')
+var mr = require('npm-registry-mock')
+var rimraf = require('rimraf')
+var test = require('tap').test
 
-var common = require("../common-tap.js")
-var npm = require("../../")
+var common = require('../common-tap.js')
+var npm = require('../../')
 
 // config
-var pkg = path.resolve(__dirname, "outdated")
-var cache = path.resolve(pkg, "cache")
-var nodeModules = path.resolve(pkg, "node_modules")
+var pkg = path.resolve(__dirname, 'outdated-long')
+var cache = path.resolve(pkg, 'cache')
 
-test("it should not throw", function (t) {
+var json = {
+  name: 'outdated-long',
+  description: 'fixture',
+  version: '0.0.1',
+  dependencies: {
+    underscore: '1.3.1'
+  }
+}
+
+test('setup', function (t) {
   cleanup()
+  mkdirp.sync(cache)
+  fs.writeFileSync(
+    path.join(pkg, 'package.json'),
+    JSON.stringify(json, null, 2)
+  )
+
   process.chdir(pkg)
+  t.end()
+})
 
+test('it should not throw', function (t) {
   var originalLog = console.log
+
   var output = []
-  var expOut = [ path.resolve(__dirname, "outdated/node_modules/underscore"),
-                 path.resolve(__dirname, "outdated/node_modules/underscore")
-               + ":underscore@1.3.1"
-               + ":underscore@1.3.1"
-               + ":underscore@1.5.1"
-               + ":dependencies" ]
-  var expData = [ [ path.resolve(__dirname, "outdated"),
-                    "underscore",
-                    "1.3.1",
-                    "1.3.1",
-                    "1.5.1",
-                    "1.3.1",
-                    "dependencies" ] ]
+  var expOut = [
+    path.resolve(pkg, 'node_modules', 'underscore'),
+    path.resolve(pkg, 'node_modules', 'underscore') +
+      ':underscore@1.3.1' +
+      ':underscore@1.3.1' +
+      ':underscore@1.5.1' +
+      ':dependencies'
+  ]
+
+  var expData = [
+    [
+      pkg,
+      'underscore',
+      '1.3.1',
+      '1.3.1',
+      '1.5.1',
+      '1.3.1',
+      'dependencies'
+    ]
+  ]
 
   console.log = function () {
     output.push.apply(output, arguments)
   }
-  mr({port : common.port}, function (er, s) {
-    npm.load({
-      cache : "cache",
-      loglevel : "silent",
-      parseable : true,
-      registry : common.registry
-    },
-    function () {
-      npm.install(".", function (err) {
-        t.ifError(err, "install success")
-        npm.config.set("long", true)
-        npm.outdated(function (er, d) {
-          t.ifError(er, "outdated success")
-          console.log = originalLog
-          t.same(output, expOut)
-          t.same(d, expData)
-          s.close()
-          t.end()
+  mr({ port: common.port }, function (er, s) {
+    npm.load(
+      {
+        cache: 'cache',
+        loglevel: 'silent',
+        parseable: true,
+        registry: common.registry
+      },
+      function () {
+        npm.install('.', function (err) {
+          t.ifError(err, 'install success')
+          npm.config.set('long', true)
+          npm.outdated(function (er, d) {
+            t.ifError(er, 'outdated success')
+
+            console.log = originalLog
+
+            t.same(output, expOut)
+            t.same(d, expData)
+
+            s.close()
+            t.end()
+          })
         })
-      })
-    })
+      }
+    )
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
   t.end()
 })
 
 function cleanup () {
-  rimraf.sync(nodeModules)
-  rimraf.sync(cache)
+  rimraf.sync(pkg)
 }