Skip to content

Commit e0e7184

Browse files
committed
Pass node-arg options to --before/--after scripts
1 parent c14c887 commit e0e7184

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

bin/run.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -822,19 +822,19 @@ const runBeforeAfter = (options, env, tap, processDB) => {
822822

823823
if (options.before) {
824824
if (options.ts && tsNode && /\.tsx?$/.test(options.before)) {
825-
beforeAfter(env, ['-r', tsNode, options.before])
825+
beforeAfter(env, ['-r', tsNode, ...options['node-arg'], options.before])
826826
} else {
827-
beforeAfter(env, [options.before])
827+
beforeAfter(env, [...options['node-arg'], options.before])
828828
}
829829
}
830830

831831
if (options.after) {
832832
/* istanbul ignore next - run after istanbul's report */
833833
signalExit(() => {
834834
if (options.ts && tsNode && /\.tsx?$/.test(options.after)) {
835-
beforeAfter(env, ['-r', tsNode, options.after])
835+
beforeAfter(env, ['-r', tsNode, ...options['node-arg'], options.after])
836836
} else {
837-
beforeAfter(env, [options.after])
837+
beforeAfter(env, [...options['node-arg'], options.after])
838838
}
839839
}, { alwaysLast: true })
840840
}

tap-snapshots/test/run/before-after.js.test.cjs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,18 @@ exports[`test/run/before-after.js TAP basic > stderr 1`] = `
1010
`
1111

1212
exports[`test/run/before-after.js TAP basic > stdout 1`] = `
13+
this is fine
1314
slow
1415
TAP version 13
1516
# Subtest: cli-tests/t1.js
17+
this is fine
1618
ok 1 - this is fine
1719
1..1
1820
# {time}
1921
ok 1 - cli-tests/t1.js # {time}
2022
2123
# Subtest: cli-tests/t2.js
24+
this is fine
2225
# Subtest: sub
2326
ok 1 - this is fine
2427
1..1
@@ -29,6 +32,7 @@ ok 1 - cli-tests/t1.js # {time}
2932
ok 2 - cli-tests/t2.js # {time}
3033
3134
# Subtest: cli-tests/t3.js
35+
this is fine
3236
# Subtest: sub
3337
not ok 1 - not fine
3438
---
@@ -54,6 +58,8 @@ ok 2 - cli-tests/t2.js # {time}
5458
not ok 3 - cli-tests/t3.js # {time}
5559
---
5660
args:
61+
- -r
62+
- ./cli-tests/loggy.js
5763
- cli-tests/t3.js
5864
command: {NODE}
5965
cwd: {CWD}
@@ -70,6 +76,7 @@ not ok 3 - cli-tests/t3.js # {time}
7076
1..3
7177
# failed 1 of 3 tests
7278
# {time}
79+
this is fine
7380
ok
7481
7582
`

test/run/before-after.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ const {
66
} = require('./')
77

88
const ok = tmpfile(t, 'ok.js', `console.log('ok')`)
9+
const loggy = tmpfile(t, 'loggy.js', `
10+
console.log('this is fine')
11+
`)
912
const fail = tmpfile(t, 'fail.js', `
1013
throw new Error('fail')
1114
`)
@@ -31,7 +34,7 @@ t.test('sub', async t => t.fail('not fine'))
3134

3235
t.test('basic', t => {
3336
t.plan(3)
34-
run([`--before=${slow}`, `--after=${ok}`, ok, slow, t1, t2, t3], {}, (er, o, e) => {
37+
run([`--node-arg=-r`, `--node-arg=./${loggy}`, `--before=${slow}`, `--after=${ok}`, ok, slow, t1, t2, t3], {}, (er, o, e) => {
3538
t.ok(er, 'error')
3639
t.matchSnapshot(o, 'stdout')
3740
t.matchSnapshot(e, 'stderr')

0 commit comments

Comments
 (0)