deps: upgrade npm beta to 5.0.0-beta.56

PR-URL: https://github.com/nodejs/node/pull/12936
Reviewed-By: Anna Henningsen <anna@addaleax.net>

1 files changed, 57 insertions, 21 deletions

diff --git a/deps/npm/test/tap/doctor.js b/deps/npm/test/tap/doctor.js
index 5cdffb2bd8..fa1a5fad1c 100644
--- a/deps/npm/test/tap/doctor.js
+++ b/deps/npm/test/tap/doctor.js
@@ -1,45 +1,76 @@
 'use strict'
-var http = require('http')
-var which = require('which')
-var mr = require('npm-registry-mock')
-var test = require('tap').test
-var common = require('../common-tap.js')
-var npm = require('../../lib/npm.js')
-var server
-var node_url
-var pingResponse = {
+
+const common = require('../common-tap.js')
+const http = require('http')
+const mr = require('npm-registry-mock')
+const npm = require('../../lib/npm.js')
+const path = require('path')
+const rimraf = require('rimraf')
+const Tacks = require('tacks')
+const test = require('tap').test
+const which = require('which')
+
+const Dir = Tacks.Dir
+const File = Tacks.File
+
+const ROOT = path.join(__dirname, path.basename(__filename, '.js'))
+const CACHE = path.join(ROOT, 'cache')
+const TMP = path.join(ROOT, 'tmp')
+const PREFIX = path.join(ROOT, 'global-prefix')
+const PKG = path.join(ROOT, 'pkg')
+
+let server
+let node_url
+const pingResponse = {
   host: 'registry.npmjs.org',
   ok: true,
   username: null,
   peer: 'example.com'
 }
-var npmResponse = {
+const npmResponse = {
+  name: 'npm',
   'dist-tags': {latest: '0.0.0'},
   'versions': {
     '0.0.0': {
+      name: 'npm',
       version: '0.0.0',
+      _shrinkwrap: null,
+      _hasShrinkwrap: false,
       dist: {
-        shasum: '',
-        tarball: ''
+        shasum: 'deadbeef',
+        tarball: 'https://reg.eh/npm-0.0.0.tgz'
       }
     }
   }
 }
 
-test('setup', function (t) {
-  var port = common.port + 1
+test('setup', (t) => {
+  const port = common.port + 1
   http.createServer(function (q, s) {
     s.end(JSON.stringify([{lts: true, version: '0.0.0'}]))
     this.close()
-  }).listen(port, function () {
+  }).listen(port, () => {
     node_url = 'http://localhost:' + port
-    mr({port: common.port}, function (e, s) {
-      t.ifError(e, 'registry mocked successfully')
+    mr({port: common.port}, (err, s) => {
+      t.ifError(err, 'registry mocked successfully')
       server = s
       server.get('/-/ping?write=true').reply(200, JSON.stringify(pingResponse))
       server.get('/npm').reply(200, JSON.stringify(npmResponse))
-      npm.load({registry: common.registry, loglevel: 'silent'}, function (e) {
-        t.ifError(e, 'npm loaded successfully')
+      const fixture = new Tacks(Dir({
+        [path.basename(PKG)]: Dir({
+          'package.json': File({name: 'foo', version: '1.0.0'})
+        }),
+        [path.basename(PREFIX)]: Dir({})
+      }))
+      fixture.create(ROOT)
+      npm.load({
+        registry: common.registry,
+        loglevel: 'silent',
+        cache: CACHE,
+        tmp: TMP,
+        prefix: PREFIX
+      }, (err) => {
+        t.ifError(err, 'npm loaded successfully')
         t.pass('all set up')
         t.done()
       })
@@ -51,14 +82,14 @@ test('npm doctor', function (t) {
   npm.commands.doctor({'node-url': node_url}, true, function (e, list) {
     t.ifError(e, 'npm loaded successfully')
     t.same(list.length, 9, 'list should have 9 prop')
-    t.same(list[0][1], 'ok', 'npm ping')
+    t.same(list[0][1], 'OK', 'npm ping')
     t.same(list[1][1], 'v' + npm.version, 'npm -v')
     t.same(list[2][1], process.version, 'node -v')
     t.same(list[3][1], common.registry + '/', 'npm config get registry')
     t.same(list[5][1], 'ok', 'Perms check on cached files')
     t.same(list[6][1], 'ok', 'Perms check on global node_modules')
     t.same(list[7][1], 'ok', 'Perms check on local node_modules')
-    t.same(list[8][1], 'ok', 'Checksum cached files')
+    t.match(list[8][1], /^verified \d+ tarballs?$/, 'Cache verified')
     which('git', function (e, resolvedPath) {
       t.ifError(e, 'git command is installed')
       t.same(list[4][1], resolvedPath, 'which git')
@@ -67,3 +98,8 @@ test('npm doctor', function (t) {
     })
   })
 })
+
+test('cleanup', (t) => {
+  rimraf.sync(ROOT)
+  t.done()
+})