test_runner: change ts default glob

PR-URL: #57359 Fixes: #56546 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Pietro Marchini <[email protected]> Reviewed-By: Paolo Insogna <[email protected]> Reviewed-By: Moshe Atlow <[email protected]>
nodejs · Mar 9, 2025 · 9df0ff7 · 9df0ff7
1 parent 9a9a45a
commit 9df0ff7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/doc/api/test.md b/doc/api/test.md
@@ -418,12 +418,9 @@ By default, Node.js will run all files matching these patterns:
 Unless [`--no-experimental-strip-types`][] is supplied, the following
 additional patterns are also matched:
 
-* `**/*.test.{cts,mts,ts}`
-* `**/*-test.{cts,mts,ts}`
-* `**/*_test.{cts,mts,ts}`
-* `**/test-*.{cts,mts,ts}`
-* `**/test.{cts,mts,ts}`
-* `**/test/**/*.{cts,mts,ts}`
+* `**/test/**/*-test.{cts,mts,ts}`
+* `**/test/**/*.test.{cts,mts,ts}`
+* `**/test/**/*_test.{cts,mts,ts}`
 
 Alternatively, one or more glob patterns can be provided as the
 final argument(s) to the Node.js command, as shown below.

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
@@ -108,7 +108,7 @@ let kResistStopPropagation;
 function createTestFileList(patterns, cwd) {
   const hasUserSuppliedPattern = patterns != null;
   if (!patterns || patterns.length === 0) {
-    patterns = [kDefaultPattern];
+    patterns = kDefaultPattern;
   }
   const glob = new Glob(patterns, {
     __proto__: null,

diff --git a/lib/internal/test_runner/utils.js b/lib/internal/test_runner/utils.js
@@ -55,10 +55,10 @@ const kRegExpPattern = /^\/(.*)\/([a-z]*)$/;
 
 const kPatterns = ['test', 'test/**/*', 'test-*', '*[._-]test'];
 const kFileExtensions = ['js', 'mjs', 'cjs'];
+const kDefaultPattern = [`**/{${ArrayPrototypeJoin(kPatterns, ',')}}.{${ArrayPrototypeJoin(kFileExtensions, ',')}}`];
 if (getOptionValue('--experimental-strip-types')) {
-  ArrayPrototypePush(kFileExtensions, 'ts', 'mts', 'cts');
+  ArrayPrototypePush(kDefaultPattern, '**/test/**/*{-,.,_}test.{cts,mts,ts}');
 }
-const kDefaultPattern = `**/{${ArrayPrototypeJoin(kPatterns, ',')}}.{${ArrayPrototypeJoin(kFileExtensions, ',')}}`;
 
 function createDeferredCallback() {
   let calledCount = 0;
@@ -290,7 +290,7 @@ function parseCommandLine() {
     if (!coverageExcludeGlobs || coverageExcludeGlobs.length === 0) {
       // TODO(pmarchini): this default should follow something similar to c8 defaults
       // Default exclusions should be also exported to be used by other tools / users
-      coverageExcludeGlobs = [kDefaultPattern];
+      coverageExcludeGlobs = kDefaultPattern;
     }
     coverageIncludeGlobs = getOptionValue('--test-coverage-include');
 

diff --git a/...ner/matching-patterns/typescript-test.cts → ...atching-patterns/test/typescript-test.cts b/...ner/matching-patterns/typescript-test.cts → ...atching-patterns/test/typescript-test.cts
diff --git a/...ner/matching-patterns/typescript-test.mts → ...atching-patterns/test/typescript-test.mts b/...ner/matching-patterns/typescript-test.mts → ...atching-patterns/test/typescript-test.mts
diff --git a/...nner/matching-patterns/typescript-test.ts → ...matching-patterns/test/typescript-test.ts b/...nner/matching-patterns/typescript-test.ts → ...matching-patterns/test/typescript-test.ts