diff options
| author | Gibson Fahnestock <gibfahn@gmail.com> | 2017-08-15 19:14:54 +0100 |
|---|---|---|
| committer | Ruben Bridgewater <ruben@bridgewater.de> | 2017-09-03 17:28:50 -0300 |
| commit | 180f86507d496b11aa35b2df4594629a92cce329 (patch) | |
| tree | 96993491524bbba0fb642f9c3c47f89b2fedf3b0 /test/parallel/test-child-process-env.js | |
| parent | ed084a035c1f657284f3eee7f7a583a42e8b35f1 (diff) | |
| download | android-node-v8-180f86507d496b11aa35b2df4594629a92cce329.tar.gz android-node-v8-180f86507d496b11aa35b2df4594629a92cce329.tar.bz2 android-node-v8-180f86507d496b11aa35b2df4594629a92cce329.zip | |
test: remove envPlus, use Object.assign everywhere
PR-URL: https://github.com/nodejs/node/pull/14845
Fixes: https://github.com/nodejs/node/issues/14823
Refs: https://github.com/nodejs/node/pull/14822
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'test/parallel/test-child-process-env.js')
| -rw-r--r-- | test/parallel/test-child-process-env.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/parallel/test-child-process-env.js b/test/parallel/test-child-process-env.js index 65e2bb3f16..4582c48fda 100644 --- a/test/parallel/test-child-process-env.js +++ b/test/parallel/test-child-process-env.js @@ -34,9 +34,11 @@ Object.setPrototypeOf(env, { let child; if (common.isWindows) { - child = spawn('cmd.exe', ['/c', 'set'], { env: env }); + child = spawn('cmd.exe', ['/c', 'set'], + Object.assign({}, process.env, { env: env })); } else { - child = spawn('/usr/bin/env', [], { env: env }); + child = spawn('/usr/bin/env', [], + Object.assign({}, process.env, { env: env })); } |