FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

test_runner: support typescript files in default glob · nodejs/node@1240197 · GitHub

/ node Public

Commit 1240197

Browse files
avivkeller
authored and
targos
committed
test_runner: support typescript files in default glob
PR-URL: #55081 Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 7982d3d commit 1240197

6 files changed

Lines changed: 55 additions & 8 deletions

File tree

‎doc/api/test.md‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -422,12 +422,22 @@ node --test
422422

423423
By default, Node.js will run all files matching these patterns:
424424

425-
* `**/*.test.?(c|m)js`
426-
* `**/*-test.?(c|m)js`
427-
* `**/*_test.?(c|m)js`
428-
* `**/test-*.?(c|m)js`
429-
* `**/test.?(c|m)js`
430-
* `**/test/**/*.?(c|m)js`
425+
* `**/*.test.{cjs,mjs,js}`
426+
* `**/*-test.{cjs,mjs,js}`
427+
* `**/*_test.{cjs,mjs,js}`
428+
* `**/test-*.{cjs,mjs,js}`
429+
* `**/test.{cjs,mjs,js}`
430+
* `**/test/**/*.{cjs,mjs,js}`
431+
432+
When [`--experimental-strip-types`][] is supplied, the following
433+
additional patterns are matched:
434+
435+
* `**/*.test.{cts,mts,ts}`
436+
* `**/*-test.{cts,mts,ts}`
437+
* `**/*_test.{cts,mts,ts}`
438+
* `**/test-*.{cts,mts,ts}`
439+
* `**/test.{cts,mts,ts}`
440+
* `**/test/**/*.{cts,mts,ts}`
431441

432442
Alternatively, one or more glob patterns can be provided as the
433443
final argument(s) to the Node.js command, as shown below.
@@ -3558,6 +3568,7 @@ Can be used to abort test subtasks when the test has been aborted.
35583568

35593569
[TAP]: https://testanything.org/
35603570
[TTY]: tty.md
3571+
[`--experimental-strip-types`]: cli.md#--experimental-strip-types
35613572
[`--experimental-test-coverage`]: cli.md#--experimental-test-coverage
35623573
[`--experimental-test-module-mocks`]: cli.md#--experimental-test-module-mocks
35633574
[`--experimental-test-snapshots`]: cli.md#--experimental-test-snapshots

‎lib/internal/test_runner/utils.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ const kMultipleCallbackInvocations = 'multipleCallbackInvocations';
5454
const kRegExpPattern = /^\/(.*)\/([a-z]*)$/;
5555

5656
const kPatterns = ['test', 'test/**/*', 'test-*', '*[._-]test'];
57-
const kDefaultPattern = `**/{${ArrayPrototypeJoin(kPatterns, ',')}}.?(c|m)js`;
58-
57+
const kFileExtensions = ['js', 'mjs', 'cjs'];
58+
if (getOptionValue('--experimental-strip-types')) {
59+
ArrayPrototypePush(kFileExtensions, 'ts', 'mts', 'cts');
60+
}
61+
const kDefaultPattern = `**/{${ArrayPrototypeJoin(kPatterns, ',')}}.{${ArrayPrototypeJoin(kFileExtensions, ',')}}`;
5962

6063
function createDeferredCallback() {
6164
let calledCount = 0;

‎test/fixtures/test-runner/matching-patterns/typescript-test.cts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
const test = require('node:test');
2+
3+
// 'as string' ensures that type stripping actually occurs
4+
test('this should pass' as string);

‎test/fixtures/test-runner/matching-patterns/typescript-test.mts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { test } from 'node:test';
2+
3+
// 'as string' ensures that type stripping actually occurs
4+
test('this should pass' as string);

‎test/fixtures/test-runner/matching-patterns/typescript-test.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
const test = require('node:test');
2+
3+
// 'as string' ensures that type stripping actually occurs
4+
test('this should pass' as string);

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,27 @@ for (const isolation of ['none', 'process']) {
5757
assert.match(stdout, /ok 1 - this should pass/);
5858
assert.match(stdout, /ok 2 - this should pass/);
5959
assert.match(stdout, /ok 3 - this should pass/);
60+
// Doesn't match the TypeScript files
61+
assert.doesNotMatch(stdout, /ok 4 - this should pass/);
62+
}
63+
64+
for (const type of ['strip', 'transform']) {
65+
// Should match files with "-test.(c|m)(t|j)s" suffix when typescript support is enabled
66+
const args = ['--test', '--test-reporter=tap', '--no-warnings',
67+
`--experimental-${type}-types`, `--experimental-test-isolation=${isolation}`];
68+
const child = spawnSync(process.execPath, args, { cwd: join(testFixtures, 'matching-patterns') });
69+
70+
assert.strictEqual(child.status, 0);
71+
assert.strictEqual(child.signal, null);
72+
assert.strictEqual(child.stderr.toString(), '');
73+
const stdout = child.stdout.toString();
74+
75+
assert.match(stdout, /ok 1 - this should pass/);
76+
assert.match(stdout, /ok 2 - this should pass/);
77+
assert.match(stdout, /ok 3 - this should pass/);
78+
assert.match(stdout, /ok 4 - this should pass/);
79+
assert.match(stdout, /ok 5 - this should pass/);
80+
assert.match(stdout, /ok 6 - this should pass/);
6081
}
6182

6283
{

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL