1 files changed, 61 insertions, 27 deletions

diff --git a/deps/npm/test/tap/peer-deps.js b/deps/npm/test/tap/peer-deps.js
index 8fa28a54f6..48023d7ac7 100644
--- a/deps/npm/test/tap/peer-deps.js
+++ b/deps/npm/test/tap/peer-deps.js
@@ -1,55 +1,89 @@
-var npm = npm = require("../../")
-var test = require("tap").test
-var path = require("path")
-var fs = require("fs")
-var osenv = require("osenv")
-var rimraf = require("rimraf")
-var mr = require("npm-registry-mock")
-var common = require("../common-tap.js")
-
-var pkg = path.resolve(__dirname, "peer-deps")
-var desiredResultsPath = path.resolve(pkg, "desired-ls-results.json")
-
-test("installs the peer dependency directory structure", function (t) {
-  mr({port : common.port}, function (er, s) {
+var fs = require('graceful-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 npm = npm = require('../../')
+
+var pkg = path.resolve(__dirname, 'peer-deps')
+
+var expected = {
+  name: 'npm-test-peer-deps-installer',
+  version: '0.0.0',
+  dependencies: {
+    'npm-test-peer-deps': {
+      version: '0.0.0',
+      from: 'npm-test-peer-deps@*',
+      resolved: common.registry + '/npm-test-peer-deps/-/npm-test-peer-deps-0.0.0.tgz',
+      dependencies: {
+        underscore: {
+          version: '1.3.1',
+          from: 'underscore@1.3.1',
+          resolved: common.registry + '/underscore/-/underscore-1.3.1.tgz'
+        }
+      }
+    },
+    request: {
+      version: '0.9.5',
+      from: 'request@>=0.9.0 <0.10.0',
+      resolved: common.registry + '/request/-/request-0.9.5.tgz'
+    }
+  }
+}
+
+var json = {
+  author: 'Domenic Denicola',
+  name: 'npm-test-peer-deps-installer',
+  version: '0.0.0',
+  dependencies: {
+    'npm-test-peer-deps': '*'
+  }
+}
+
+test('installs the peer dependency directory structure', function (t) {
+  mr({ port: common.port }, function (er, s) {
     setup(function (err) {
       if (err) return t.fail(err)
 
-      npm.install(".", function (err) {
+      npm.install('.', function (err) {
         if (err) return t.fail(err)
 
         npm.commands.ls([], true, function (err, _, results) {
           if (err) return t.fail(err)
 
-          fs.readFile(desiredResultsPath, function (err, desired) {
-            if (err) return t.fail(err)
-
-            t.deepEqual(results, JSON.parse(desired))
-            s.close()
-            t.end()
-          })
+          t.deepEqual(results, expected)
+          s.close()
+          t.end()
         })
       })
     })
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
   t.end()
 })
 
-
 function setup (cb) {
   cleanup()
+  mkdirp.sync(pkg)
+  fs.writeFileSync(
+    path.join(pkg, 'package.json'),
+    JSON.stringify(json, null, 2)
+  )
   process.chdir(pkg)
 
-  var opts = { cache: path.resolve(pkg, "cache"), registry: common.registry}
+  var opts = { cache: path.resolve(pkg, 'cache'), registry: common.registry}
   npm.load(opts, cb)
 }
 
 function cleanup () {
   process.chdir(osenv.tmpdir())
-  rimraf.sync(path.resolve(pkg, "node_modules"))
-  rimraf.sync(path.resolve(pkg, "cache"))
+  rimraf.sync(pkg)
 }