From 243acc3b9b5d2b97a0667979c02da9bc56d858df Mon Sep 17 00:00:00 2001 From: poutch Date: Tue, 12 Nov 2019 15:49:04 +0000 Subject: [PATCH 1/3] test: change object assign to spread object in test-npm-install.js --- test/parallel/test-npm-install.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-npm-install.js b/test/parallel/test-npm-install.js index 069465466df682..85c424dcbf0bc7 100644 --- a/test/parallel/test-npm-install.js +++ b/test/parallel/test-npm-install.js @@ -38,12 +38,12 @@ const pkgPath = path.join(installDir, 'package.json'); fs.writeFileSync(pkgPath, pkgContent); -const env = Object.assign({}, process.env, { +const env = {...process.env, ...{ PATH: path.dirname(process.execPath), NPM_CONFIG_PREFIX: path.join(npmSandbox, 'npm-prefix'), NPM_CONFIG_TMP: path.join(npmSandbox, 'npm-tmp'), HOME: homeDir, -}); +}}; exec(`${process.execPath} ${npmPath} install`, { cwd: installDir, From 5ec47ba5324b661f9d1041e8538afec0d57f8322 Mon Sep 17 00:00:00 2001 From: poutch Date: Tue, 12 Nov 2019 15:55:37 +0000 Subject: [PATCH 2/3] test: clean spread object in test-npm-install.js --- test/parallel/test-npm-install.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-npm-install.js b/test/parallel/test-npm-install.js index 85c424dcbf0bc7..01e248b05e070e 100644 --- a/test/parallel/test-npm-install.js +++ b/test/parallel/test-npm-install.js @@ -38,12 +38,12 @@ const pkgPath = path.join(installDir, 'package.json'); fs.writeFileSync(pkgPath, pkgContent); -const env = {...process.env, ...{ +const env = {...process.env, PATH: path.dirname(process.execPath), NPM_CONFIG_PREFIX: path.join(npmSandbox, 'npm-prefix'), NPM_CONFIG_TMP: path.join(npmSandbox, 'npm-tmp'), HOME: homeDir, -}}; +}; exec(`${process.execPath} ${npmPath} install`, { cwd: installDir, From c7efb41b79d073c9ff08f8bc77b7c554dec7b7ef Mon Sep 17 00:00:00 2001 From: poutch Date: Tue, 12 Nov 2019 16:05:30 +0000 Subject: [PATCH 3/3] test: resolve eslint errors in test-npm-install.js --- test/parallel/test-npm-install.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/parallel/test-npm-install.js b/test/parallel/test-npm-install.js index 01e248b05e070e..1eec5f57ad6db9 100644 --- a/test/parallel/test-npm-install.js +++ b/test/parallel/test-npm-install.js @@ -38,11 +38,11 @@ const pkgPath = path.join(installDir, 'package.json'); fs.writeFileSync(pkgPath, pkgContent); -const env = {...process.env, - PATH: path.dirname(process.execPath), - NPM_CONFIG_PREFIX: path.join(npmSandbox, 'npm-prefix'), - NPM_CONFIG_TMP: path.join(npmSandbox, 'npm-tmp'), - HOME: homeDir, +const env = { ...process.env, + PATH: path.dirname(process.execPath), + NPM_CONFIG_PREFIX: path.join(npmSandbox, 'npm-prefix'), + NPM_CONFIG_TMP: path.join(npmSandbox, 'npm-tmp'), + HOME: homeDir, }; exec(`${process.execPath} ${npmPath} install`, {