Skip to content

Commit c81e537

Browse files
rluvatonrluvaton
committed
test: reorder test files fixtures for better understanding
PR-URL: nodejs#48787 Backport-PR-URL: nodejs#49174 Reviewed-By: Moshe Atlow <[email protected]> Reviewed-By: Chemi Atlow <[email protected]>
1 parent edece64 commit c81e537

File tree

10 files changed

+51
-27
lines changed

10 files changed

+51
-27
lines changed

test/fixtures/test-runner/index.test.js renamed to test/fixtures/test-runner/default-behavior/index.test.js

File renamed without changes.

test/fixtures/test-runner/node_modules/test-nm.js renamed to test/fixtures/test-runner/default-behavior/node_modules/test-nm.js

File renamed without changes.

test/fixtures/test-runner/random.test.mjs renamed to test/fixtures/test-runner/default-behavior/random.test.mjs

File renamed without changes.

test/fixtures/test-runner/subdir/subdir_test.js renamed to test/fixtures/test-runner/default-behavior/subdir/subdir_test.js

File renamed without changes.

test/fixtures/test-runner/test/random.cjs renamed to test/fixtures/test-runner/default-behavior/test/random.cjs

File renamed without changes.

test/fixtures/test-runner/test/skip_by_name.cjs renamed to test/fixtures/test-runner/default-behavior/test/skip_by_name.cjs

File renamed without changes.

‎test/parallel/test-runner-cli.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ const testFixtures = fixtures.path('test-runner');
2020
}
2121

2222
{
23-
// Default behavior. node_modules is ignored. Files that don't match the
24-
// pattern are ignored except in test/ directories.
25-
const args = ['--test', testFixtures];
26-
const child = spawnSync(process.execPath, args);
23+
const args = ['--test'];
24+
const child = spawnSync(process.execPath, args, {
25+
cwd: join(testFixtures, 'default-behavior')
26+
});
2727

2828
assert.strictEqual(child.status, 1);
2929
assert.strictEqual(child.signal, null);
@@ -39,8 +39,10 @@ const testFixtures = fixtures.path('test-runner');
3939

4040
{
4141
// Same but with a prototype mutation in require scripts.
42-
const args = ['--require', join(testFixtures, 'protoMutation.js'), '--test', testFixtures];
43-
const child = spawnSync(process.execPath, args);
42+
const args = ['--require', join(testFixtures, 'protoMutation.js'), '--test'];
43+
const child = spawnSync(process.execPath, args, {
44+
cwd: join(testFixtures, 'default-behavior')
45+
});
4446

4547
const stdout = child.stdout.toString();
4648
assert.match(stdout, /ok 1 - this should pass/);
@@ -56,23 +58,21 @@ const testFixtures = fixtures.path('test-runner');
5658

5759
{
5860
// User specified files that don't match the pattern are still run.
59-
const args = ['--test', testFixtures, join(testFixtures, 'index.js')];
60-
const child = spawnSync(process.execPath, args);
61+
const args = ['--test', join(testFixtures, 'index.js')];
62+
const child = spawnSync(process.execPath, args, {
63+
cwd: testFixtures
64+
});
6165

6266
assert.strictEqual(child.status, 1);
6367
assert.strictEqual(child.signal, null);
6468
assert.strictEqual(child.stderr.toString(), '');
6569
const stdout = child.stdout.toString();
6670
assert.match(stdout, /not ok 1 - .+index\.js/);
67-
assert.match(stdout, /ok 2 - this should pass/);
68-
assert.match(stdout, /not ok 3 - this should fail/);
69-
assert.match(stdout, /ok 4 - .+subdir.+subdir_test\.js/);
70-
assert.match(stdout, /ok 5 - this should pass/);
7171
}
7272

7373
{
7474
// Searches node_modules if specified.
75-
const args = ['--test', join(testFixtures, 'node_modules')];
75+
const args = ['--test', join(testFixtures, 'default-behavior/node_modules')];
7676
const child = spawnSync(process.execPath, args);
7777

7878
assert.strictEqual(child.status, 1);
@@ -85,7 +85,7 @@ const testFixtures = fixtures.path('test-runner');
8585
{
8686
// The current directory is used by default.
8787
const args = ['--test'];
88-
const options = { cwd: testFixtures };
88+
const options = { cwd: join(testFixtures, 'default-behavior') };
8989
const child = spawnSync(process.execPath, args, options);
9090

9191
assert.strictEqual(child.status, 1);
@@ -124,7 +124,7 @@ const testFixtures = fixtures.path('test-runner');
124124
// Test combined stream outputs
125125
const args = [
126126
'--test',
127-
'test/fixtures/test-runner/index.test.js',
127+
'test/fixtures/test-runner/default-behavior/index.test.js',
128128
'test/fixtures/test-runner/nested.js',
129129
'test/fixtures/test-runner/invalid-tap.js',
130130
];
@@ -202,7 +202,7 @@ const testFixtures = fixtures.path('test-runner');
202202
const args = ['--no-warnings',
203203
'--experimental-loader', 'data:text/javascript,',
204204
'--require', fixtures.path('empty.js'),
205-
'--test', join(testFixtures, 'index.test.js')];
205+
'--test', join(testFixtures, 'default-behavior', 'index.test.js')];
206206
const child = spawnSync(process.execPath, args);
207207

208208
assert.strictEqual(child.stderr.toString(), '');

‎test/parallel/test-runner-exit-code.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ if (process.argv[2] === 'child') {
4343
assert.strictEqual(child.status, 0);
4444
assert.strictEqual(child.signal, null);
4545

46-
child = spawnSync(process.execPath, ['--test', fixtures.path('test-runner', 'subdir', 'subdir_test.js')]);
46+
child = spawnSync(process.execPath, [
47+
'--test',
48+
fixtures.path('test-runner', 'default-behavior', 'subdir', 'subdir_test.js'),
49+
]);
4750
assert.strictEqual(child.status, 0);
4851
assert.strictEqual(child.signal, null);
4952

‎test/parallel/test-runner-inspect.mjs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ common.skipIfInspectorDisabled();
1111
tmpdir.refresh();
1212

1313
{
14-
const child = new NodeInstance(['--test', '--inspect-brk=0'], undefined, fixtures.path('test-runner/index.test.js'));
14+
const child = new NodeInstance(
15+
['--test', '--inspect-brk=0'],
16+
undefined,
17+
fixtures.path('test-runner/default-behavior/index.test.js')
18+
);
1519

1620
let stdout = '';
1721
let stderr = '';

‎test/parallel/test-runner-run.mjs‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,20 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
2626
});
2727

2828
it('should succeed with a file', async () => {
29-
const stream = run({ files: [join(testFixtures, 'test/random.cjs')] });
29+
const stream = run({ files: [join(testFixtures, 'default-behavior/test/random.cjs')] });
3030
stream.on('test:fail', common.mustNotCall());
3131
stream.on('test:pass', common.mustCall(1));
3232
// eslint-disable-next-line no-unused-vars
3333
for await (const _ of stream);
3434
});
3535

3636
it('should run same file twice', async () => {
37-
const stream = run({ files: [join(testFixtures, 'test/random.cjs'), join(testFixtures, 'test/random.cjs')] });
37+
const stream = run({
38+
files: [
39+
join(testFixtures, 'default-behavior/test/random.cjs'),
40+
join(testFixtures, 'default-behavior/test/random.cjs'),
41+
]
42+
});
3843
stream.on('test:fail', common.mustNotCall());
3944
stream.on('test:pass', common.mustCall(2));
4045
// eslint-disable-next-line no-unused-vars
@@ -68,7 +73,9 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
6873
});
6974

7075
it('should be piped with dot', async () => {
71-
const result = await run({ files: [join(testFixtures, 'test/random.cjs')] }).compose(dot).toArray();
76+
const result = await run({
77+
files: [join(testFixtures, 'default-behavior/test/random.cjs')]
78+
}).compose(dot).toArray();
7279
assert.deepStrictEqual(result, [
7380
'.',
7481
'\n',
@@ -77,15 +84,19 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
7784

7885
it('should be piped with spec', async () => {
7986
const specReporter = new spec();
80-
const result = await run({ files: [join(testFixtures, 'test/random.cjs')] }).compose(specReporter).toArray();
87+
const result = await run({
88+
files: [join(testFixtures, 'default-behavior/test/random.cjs')]
89+
}).compose(specReporter).toArray();
8190
const stringResults = result.map((bfr) => bfr.toString());
8291
assert.match(stringResults[0], /this should pass/);
8392
assert.match(stringResults[1], /tests 1/);
8493
assert.match(stringResults[1], /pass 1/);
8594
});
8695

8796
it('should be piped with tap', async () => {
88-
const result = await run({ files: [join(testFixtures, 'test/random.cjs')] }).compose(tap).toArray();
97+
const result = await run({
98+
files: [join(testFixtures, 'default-behavior/test/random.cjs')]
99+
}).compose(tap).toArray();
89100
assert.strictEqual(result.length, 13);
90101
assert.strictEqual(result[0], 'TAP version 13\n');
91102
assert.strictEqual(result[1], '# Subtest: this should pass\n');
@@ -103,15 +114,21 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
103114
});
104115

105116
it('should skip tests not matching testNamePatterns - RegExp', async () => {
106-
const result = await run({ files: [join(testFixtures, 'test/skip_by_name.cjs')], testNamePatterns: [/executed/] })
117+
const result = await run({
118+
files: [join(testFixtures, 'default-behavior/test/skip_by_name.cjs')],
119+
testNamePatterns: [/executed/]
120+
})
107121
.compose(tap)
108122
.toArray();
109123
assert.strictEqual(result[2], 'ok 1 - this should be skipped # SKIP test name does not match pattern\n');
110124
assert.strictEqual(result[5], 'ok 2 - this should be executed\n');
111125
});
112126

113127
it('should skip tests not matching testNamePatterns - string', async () => {
114-
const result = await run({ files: [join(testFixtures, 'test/skip_by_name.cjs')], testNamePatterns: ['executed'] })
128+
const result = await run({
129+
files: [join(testFixtures, 'default-behavior/test/skip_by_name.cjs')],
130+
testNamePatterns: ['executed']
131+
})
115132
.compose(tap)
116133
.toArray();
117134
assert.strictEqual(result[2], 'ok 1 - this should be skipped # SKIP test name does not match pattern\n');
@@ -121,7 +138,7 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
121138
it('should emit "test:watch:drained" event on watch mode', async () => {
122139
const controller = new AbortController();
123140
await run({
124-
files: [join(testFixtures, 'test/random.cjs')],
141+
files: [join(testFixtures, 'default-behavior/test/random.cjs')],
125142
watch: true,
126143
signal: controller.signal,
127144
}).on('data', function({ type }) {
@@ -135,7 +152,7 @@ describe('require(\'node:test\').run', { concurrency: true }, () => {
135152
it('should stop watch mode when abortSignal aborts', async () => {
136153
const controller = new AbortController();
137154
const result = await run({
138-
files: [join(testFixtures, 'test/random.cjs')],
155+
files: [join(testFixtures, 'default-behavior/test/random.cjs')],
139156
watch: true,
140157
signal: controller.signal,
141158
})

0 commit comments

Comments
 (0)