diff options
author | Rebecca Turner <me@re-becca.org> | 2016-01-28 18:11:35 -0800 |
---|---|---|
committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2016-02-01 10:43:34 -0500 |
commit | 76cb81b354de8447898427619c66c86c59b22b3d (patch) | |
tree | 0c0826bed77086fb38cda8dc680d4fb10d2cff25 /deps/npm/test/tap/scripts-whitespace-windows.js | |
parent | d5d301f3032a0723f5a29cfbe0d95ac4ad205d42 (diff) | |
download | node-new-76cb81b354de8447898427619c66c86c59b22b3d.tar.gz |
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>
Diffstat (limited to 'deps/npm/test/tap/scripts-whitespace-windows.js')
-rw-r--r-- | deps/npm/test/tap/scripts-whitespace-windows.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/deps/npm/test/tap/scripts-whitespace-windows.js b/deps/npm/test/tap/scripts-whitespace-windows.js index 5aa7d00840..bff0e534ef 100644 --- a/deps/npm/test/tap/scripts-whitespace-windows.js +++ b/deps/npm/test/tap/scripts-whitespace-windows.js @@ -35,6 +35,8 @@ var dependency = { bin: [ 'bin/foo' ] } +var extend = Object.assign || require('util')._extend + var foo = function () {/* #!/usr/bin/env node @@ -63,12 +65,12 @@ test('setup', function (t) { common.npm(['i', dep], { cwd: pkg, - env: { + env: extend({ npm_config_cache: cache, npm_config_tmp: tmp, npm_config_prefix: pkg, npm_config_global: 'false' - } + }, process.env) }, function (err, code, stdout, stderr) { t.ifErr(err, 'npm i ' + dep + ' finished without error') t.equal(code, 0, 'npm i ' + dep + ' exited ok') |