deps: upgrade npm to 3.6.0

PR-URL: https://github.com/nodejs/node/pull/4958
Reviewed-By: Myles Borins <mborins@us.ibm.com>
Reviewed-By: Kat Marchán <kzm@sykosomatic.org>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/deps/npm/test/tap/config-basic.js b/deps/npm/test/tap/config-basic.js
index 82fa8ab585..ff33181470 100644
--- a/deps/npm/test/tap/config-basic.js
+++ b/deps/npm/test/tap/config-basic.js
@@ -5,7 +5,8 @@ var path = require('path')
 
 var projectData = {
   'save-prefix': '~',
-  'proprietary-attribs': false
+  'proprietary-attribs': false,
+  'legacy-bundling': true
 }
 
 var ucData = common.ucData
@@ -53,15 +54,16 @@ var expectSources = {
 }
 
 test('no builtin', function (t) {
+  t.comment(process.env)
   npmconf.load(cli, function (er, conf) {
     if (er) throw er
-    t.same(conf.list, expectList)
-    t.same(conf.sources, expectSources)
-    t.same(npmconf.rootConf.list, [])
-    t.equal(npmconf.rootConf.root, npmconf.defs.defaults)
-    t.equal(conf.root, npmconf.defs.defaults)
-    t.equal(conf.get('umask'), parseInt('022', 8))
-    t.equal(conf.get('heading'), 'npm')
+    t.same(conf.list, expectList, 'config properties in list format match expected')
+    t.same(conf.sources, expectSources, 'config by source matches expected')
+    t.same(npmconf.rootConf.list, [], 'root configuration is empty')
+    t.equal(npmconf.rootConf.root, npmconf.defs.defaults, 'defaults match up')
+    t.equal(conf.root, npmconf.defs.defaults, 'current root config matches defaults')
+    t.equal(conf.get('umask'), parseInt('022', 8), 'umask is as expected')
+    t.equal(conf.get('heading'), 'npm', 'config name is as expected')
     t.end()
   })
 })