OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2026-01-15 12:15:26 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

test: use spread object

Browse Source 
Object.assign() can be replaced by spread objects

PR-URL: https://github.com/nodejs/node/pull/30423
Refs: https://eslint.org/docs/rules/prefer-object-spread
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Fran Herrero
2019-11-12 15:40:35 +00:00
committed by Ruben Bridgewater
parent 76d4a23468
commit c52ebc06da
23 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/fixtures/v8-coverage/spawn-subprocess-no-cov.js vendored
View File

@@ -1,5 +1,5 @@
const { spawnSync } = require('child_process');
const env = Object.assign({}, process.env, { NODE_V8_COVERAGE: '' });
const env = { ...process.env, NODE_V8_COVERAGE: '' };
spawnSync(process.execPath, [require.resolve('./subprocess')], {
env: env
});

2
test/fixtures/v8-coverage/spawn-subprocess.js vendored
View File

@@ -1,5 +1,5 @@
const { spawnSync } = require('child_process');
const env = Object.assign({}, process.env);
const env = { ...process.env };
delete env.NODE_V8_COVERAGE
spawnSync(process.execPath, [require.resolve('./subprocess')], {
env: env

5
test/parallel/test-child-process-env.js
View File

@@ -26,12 +26,13 @@ const os = require('os');
const spawn = require('child_process').spawn;
const env = Object.assign({}, process.env, {
const env = {
...process.env,
'HELLO': 'WORLD',
'UNDEFINED': undefined,
'NULL': null,
'EMPTY': ''
});
};
Object.setPrototypeOf(env, {
'FOO': 'BAR'
});

2
test/parallel/test-child-process-exec-env.js
View File

@@ -45,7 +45,7 @@ if (!common.isWindows) {
child = exec('/usr/bin/env', { env: { 'HELLO': 'WORLD' } }, after);
} else {
child = exec('set',
{ env: Object.assign({}, process.env, { 'HELLO': 'WORLD' }) },
{ env: { ...process.env, 'HELLO': 'WORLD' } },
after);
}

2
test/parallel/test-child-process-fork-no-shell.js
View File

@@ -8,7 +8,7 @@ const expected = common.isWindows ? '%foo%' : '$foo';
if (process.argv[2] === undefined) {
const child = cp.fork(__filename, [expected], {
shell: true,
env: Object.assign({}, process.env, { foo: 'bar' })
env: { ...process.env, foo: 'bar' }
});
child.on('exit', common.mustCall((code, signal) => {

2
test/parallel/test-child-process-spawn-shell.js
View File

@@ -50,7 +50,7 @@ command.on('close', common.mustCall((code, signal) => {
// Verify that the environment is properly inherited
const env = cp.spawn(`"${process.execPath}" -pe process.env.BAZ`, {
env: Object.assign({}, process.env, { BAZ: 'buzz' }),
env: { ...process.env, BAZ: 'buzz' },
encoding: 'utf8',
shell: true
});

2
test/parallel/test-child-process-spawnsync-shell.js
View File

@@ -37,7 +37,7 @@ assert.strictEqual(command.stdout.toString().trim(), 'bar');
// Verify that the environment is properly inherited
const env = cp.spawnSync(`"${process.execPath}" -pe process.env.BAZ`, {
env: Object.assign({}, process.env, { BAZ: 'buzz' }),
env: { ...process.env, BAZ: 'buzz' },
shell: true
});

2
test/parallel/test-cli-node-options-disallowed.js
View File

@@ -28,7 +28,7 @@ disallow('--v8-options');
disallow('--');
function disallow(opt) {
const env = Object.assign({}, process.env, { NODE_OPTIONS: opt });
const env = { ...process.env, NODE_OPTIONS: opt };
exec(process.execPath, { cwd: tmpdir.path, env }, common.mustCall((err) => {
const message = err.message.split(/\r?\n/)[1];
const expect = `${process.execPath}: ${opt} is not allowed in NODE_OPTIONS`;

2
test/parallel/test-crypto-fips.js
View File

@@ -71,7 +71,7 @@ testHelper(
[],
FIPS_DISABLED,
'require("crypto").getFips()',
Object.assign({}, process.env, { 'OPENSSL_CONF': '' }));
{ ...process.env, 'OPENSSL_CONF': '' });
// --enable-fips should turn FIPS mode on
testHelper(

2
test/parallel/test-env-var-no-warnings.js
View File

@@ -7,7 +7,7 @@ if (process.argv[2] === 'child') {
process.emitWarning('foo');
} else {
function test(newEnv) {
const env = Object.assign({}, process.env, newEnv);
const env = { ...process.env, ...newEnv };
const cmd = `"${process.execPath}" "${__filename}" child`;
cp.exec(cmd, { env }, common.mustCall((err, stdout, stderr) => {

2
test/parallel/test-fs-readfile-error.js
View File

@@ -37,7 +37,7 @@ const fixtures = require('../common/fixtures');
function test(env, cb) {
const filename = fixtures.path('test-fs-readfile-error.js');
const execPath = `"${process.execPath}" "${filename}"`;
const options = { env: Object.assign({}, process.env, env) };
const options = { env: { ...process.env, ...env } };
exec(execPath, options, (err, stdout, stderr) => {
assert(err);
assert.strictEqual(stdout, '');

4
test/parallel/test-http-server-stale-close.js
View File

@@ -44,9 +44,7 @@ if (process.env.NODE_TEST_FORK_PORT) {
});
server.listen(0, function() {
fork(__filename, {
env: Object.assign({}, process.env, {
NODE_TEST_FORK_PORT: this.address().port
})
env: { ...process.env, NODE_TEST_FORK_PORT: this.address().port }
});
});
}

2
test/parallel/test-https-agent-additional-options.js
View File

@@ -63,7 +63,7 @@ function variations(iter, port, cb) {
// Save `value` for check the next time.
value = next.value.val;
const [key, val] = next.value;
https.get(Object.assign({}, getBaseOptions(port), { [key]: val }),
https.get({ ...getBaseOptions(port), [key]: val },
variations(iter, port, cb));
}
}));

2
test/parallel/test-icu-data-dir.js
View File

@@ -21,7 +21,7 @@ const expected =
}
{
const env = Object.assign({}, process.env, { NODE_ICU_DATA: '/' });
const env = { ...process.env, NODE_ICU_DATA: '/' };
const child = spawnSync(process.execPath, ['-e', '0'], { env });
assert(child.stderr.toString().includes(expected));
}

2
test/parallel/test-module-loading-globalpaths.js
View File

@@ -41,7 +41,7 @@ if (process.argv[2] === 'child') {
const testFixturesDir = fixtures.path(path.basename(__filename, '.js'));
const env = Object.assign({}, process.env);
const env = { ...process.env };
// Unset NODE_PATH.
delete env.NODE_PATH;

2
test/parallel/test-net-connect-options-fd.js
View File

@@ -15,7 +15,7 @@ tmpdir.refresh();
function testClients(getSocketOpt, getConnectOpt, getConnectCb) {
const cloneOptions = (index) =>
Object.assign({}, getSocketOpt(index), getConnectOpt(index));
({ ...getSocketOpt(index), ...getConnectOpt(index) });
return [
net.connect(cloneOptions(0), getConnectCb(0)),
net.connect(cloneOptions(1))

2
test/parallel/test-pending-deprecation.js
View File

@@ -55,7 +55,7 @@ switch (process.argv[2]) {
// Test the NODE_PENDING_DEPRECATION environment var.
fork(__filename, ['env'], {
env: Object.assign({}, process.env, { NODE_PENDING_DEPRECATION: 1 }),
env: { ...process.env, NODE_PENDING_DEPRECATION: 1 },
execArgv: ['--expose-internals'],
silent: true
}).on('exit', common.mustCall((code) => {

3
test/parallel/test-process-redirect-warnings-env.js
View File

@@ -18,8 +18,7 @@ tmpdir.refresh();
const warnmod = require.resolve(fixtures.path('warnings.js'));
const warnpath = path.join(tmpdir.path, 'warnings.txt');
fork(warnmod, { env: Object.assign({}, process.env,
{ NODE_REDIRECT_WARNINGS: warnpath }) })
fork(warnmod, { env: { ...process.env, NODE_REDIRECT_WARNINGS: warnpath } })
.on('exit', common.mustCall(() => {
fs.readFile(warnpath, 'utf8', common.mustCall((err, data) => {
assert.ifError(err);

6
test/parallel/test-stdin-script-child.js
View File

@@ -5,9 +5,9 @@ const assert = require('assert');
const { spawn } = require('child_process');
for (const args of [[], ['-']]) {
const child = spawn(process.execPath, args, {
env: Object.assign({}, process.env, {
NODE_DEBUG: process.argv[2]
})
env: { ...process.env,
NODE_DEBUG: process.argv[2]
}
});
const wanted = `${child.pid}\n`;
let found = '';

5
test/parallel/test-tls-env-bad-extra-ca.js
View File

@@ -16,10 +16,11 @@ if (process.env.CHILD) {
return tls.createServer({});
}
const env = Object.assign({}, process.env, {
const env = {
...process.env,
CHILD: 'yes',
NODE_EXTRA_CA_CERTS: `${fixtures.fixturesDir}/no-such-file-exists-🐢`,
});
};
const opts = {
env: env,

2
test/parallel/test-tls-env-extra-ca-file-load.js
View File

@@ -25,7 +25,7 @@ if (process.argv[2] !== 'child') {
}
} else {
const NODE_EXTRA_CA_CERTS = fixtures.path('keys', 'ca1-cert.pem');
const extendsEnv = (obj) => Object.assign({}, process.env, obj);
const extendsEnv = (obj) => ({ ...process.env, ...obj });
[
extendsEnv({ CHILD_USE_EXTRA_CA_CERTS: 'yes', NODE_EXTRA_CA_CERTS }),

2
test/parallel/test-tls-env-extra-ca-no-crypto.js
View File

@@ -14,7 +14,7 @@ if (process.argv[2] === 'child') {
fork(
__filename,
['child'],
{ env: Object.assign({}, process.env, { NODE_EXTRA_CA_CERTS }) },
{ env: { ...process.env, NODE_EXTRA_CA_CERTS } },
).on('exit', common.mustCall(function(status) {
// Client did not succeed in connecting
assert.strictEqual(status, 0);

5
test/parallel/test-tls-env-extra-ca.js
View File

@@ -32,11 +32,12 @@ const server = tls.createServer(options, common.mustCall(function(s) {
s.end('bye');
server.close();
})).listen(0, common.mustCall(function() {
const env = Object.assign({}, process.env, {
const env = {
...process.env,
CHILD: 'yes',
PORT: this.address().port,
NODE_EXTRA_CA_CERTS: fixtures.path('keys', 'ca1-cert.pem')
});
};
fork(__filename, { env }).on('exit', common.mustCall(function(status) {
// Client did not succeed in connecting