npm: Upgrade to v2.1.6

1 files changed, 19 insertions, 18 deletions

diff --git a/deps/npm/test/tap/install-cli-unicode.js b/deps/npm/test/tap/install-cli-unicode.js
index bb9b4f5eed..7318deffca 100644
--- a/deps/npm/test/tap/install-cli-unicode.js
+++ b/deps/npm/test/tap/install-cli-unicode.js
@@ -1,23 +1,24 @@
-var common = require('../common-tap.js')
-var test = require('tap').test
-var npm = require('../../')
-var mkdirp = require('mkdirp')
-var mr = require('npm-registry-mock')
-var exec = require('child_process').exec
+var common = require("../common-tap.js")
+var test = require("tap").test
+var mr = require("npm-registry-mock")
+var path = require("path")
 
-var pkg = __dirname + '/install-cli'
-var NPM_BIN = __dirname + '/../../bin/npm-cli.js'
+var pkg = path.resolve(__dirname, "install-cli")
 
 function hasOnlyAscii (s) {
-  return /^[\000-\177]*$/.test(s) ;
+  return /^[\000-\177]*$/.test(s)
 }
 
-test('does not use unicode with --unicode false', function (t) {
-  t.plan(3)
+var EXEC_OPTS = {
+  cwd : pkg
+}
+
+test("does not use unicode with --unicode false", function (t) {
+  t.plan(5)
   mr(common.port, function (s) {
-    exec('node ' + NPM_BIN + ' install --unicode false read', {
-      cwd: pkg
-    }, function(err, stdout) {
+    common.npm(["install", "--unicode", "false", "read"], EXEC_OPTS, function (err, code, stdout) {
+      t.ifError(err, "install package read without unicode success")
+      t.notOk(code, "npm install exited with code 0")
       t.ifError(err)
       t.ok(stdout, stdout.length)
       t.ok(hasOnlyAscii(stdout))
@@ -26,11 +27,11 @@ test('does not use unicode with --unicode false', function (t) {
   })
 })
 
-test('cleanup', function (t) {
+test("cleanup", function (t) {
   mr(common.port, function (s) {
-    exec('node ' + NPM_BIN + ' uninstall read', {
-      cwd: pkg
-    }, function(err, stdout) {
+    common.npm(["uninstall", "read"], EXEC_OPTS, function (err, code) {
+      t.ifError(err, "uninstall read package success")
+      t.notOk(code, "npm uninstall exited with code 0")
       s.close()
     })
   })