Skip to content

Object.assign -> object spread in several tests #30306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
glevanov wants to merge 10 commits into from
Closed

Object.assign -> object spread in several tests #30306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3046aa7
url: replace Object.assign with object spread
Nov 6, 2019
1e3d014
util: replace Object.assign with object spread
Nov 6, 2019
8e40d02
url: fix linter warnings
Nov 6, 2019
65a1dad
util: fix linter warnings
Nov 6, 2019
3776cb6
test: replace Object.assign with object spread
Nov 6, 2019
bd7b1c1
test: replace Object.assign with object spread
Nov 6, 2019
7cfb619
test: replace Object.assign with object spread
Nov 6, 2019
f201ccd
test: replace Object.assign with object spread
Nov 6, 2019
afbc5d3
test: replace Object.assign with object spread
Nov 6, 2019
621e12f
test: fix object spread for inline objects
Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
test: fix object spread for inline objects 
Removes spread for inline objects - same can be achieved by discarding
object literal
  • Loading branch information
Grigoriy Levanov committed Nov 6, 2019
commit 621e12ff6738ca6a02b0484e3d8ef99ee641800f
8 changes: 4 additions & 4 deletions test/parallel/test-trace-events-async-hooks-dynamic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ const proc = cp.spawnSync(
['-e', enable + code ],
{
cwd: tmpdir.path,
env: { ...process.env, ...{
'NODE_DEBUG_NATIVE': 'tracing',
'NODE_DEBUG': 'tracing'
} }
env: { ...process.env,
'NODE_DEBUG_NATIVE': 'tracing',
'NODE_DEBUG': 'tracing'
}
});

console.log('process exit with signal:', proc.signal);
Expand Down
8 changes: 4 additions & 4 deletions test/parallel/test-trace-events-async-hooks-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ const proc = cp.spawnSync(
[ '--trace-event-categories', 'node.async_hooks', '-e', worker ],
{
cwd: tmpdir.path,
env: { ...process.env, ...{
'NODE_DEBUG_NATIVE': 'tracing',
'NODE_DEBUG': 'tracing'
} }
env: { ...process.env,
'NODE_DEBUG_NATIVE': 'tracing',
'NODE_DEBUG': 'tracing'
}
});

console.log('process exit with signal:', proc.signal);
Expand Down
2 changes: 1 addition & 1 deletion test/sequential/test-inspector-open.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if (process.env.BE_CHILD)
return beChild();

const child = fork(__filename,
{ env: { ...process.env, ...{ BE_CHILD: 1 } } });
{ env: { ...process.env, BE_CHILD: 1 } });

child.once('message', common.mustCall((msg) => {
assert.strictEqual(msg.cmd, 'started');
Expand Down
10 changes: 5 additions & 5 deletions test/sequential/test-inspector-port-cluster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,11 @@ function workerProcessMain() {
function spawnMaster({ execArgv, workers, clusterSettings = {} }) {
return new Promise((resolve) => {
childProcess.fork(__filename, {
env: { ...process.env, ...{
workers: JSON.stringify(workers),
clusterSettings: JSON.stringify(clusterSettings),
testProcess: true
} },
env: { ...process.env,
workers: JSON.stringify(workers),
clusterSettings: JSON.stringify(clusterSettings),
testProcess: true
},
execArgv: execArgv.concat(['--expose-internals'])
}).on('exit', common.mustCall((code, signal) => {
checkExitCode(code, signal);
Expand Down