test_runner: restore directory search for --test

Passing a directory to `node --test` (e.g. `node --test tests`) matched
the directory itself as a glob pattern and then tried to run it as a
test file, failing with MODULE_NOT_FOUND. Before glob patterns were
supported, a directory argument was searched for test files within it.
Expand a pattern that resolves to a directory into a search for the
default test files inside it. Despite the report framing this as
Windows-only, it reproduces on every platform: it is a plain
regression from when directory arguments stopped being searched.
Fixes: #64555
Signed-off-by: Paul Bouchon <mail@bitpshr.net>
PR-URL: #64637
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>

Author: bitpshr

lib/internal/test_runner/runner.js

@@ -19,6 +19,7 @@ const {
  ObjectAssign,
  PromisePrototypeThen,
  PromiseWithResolvers,
+ RegExpPrototypeSymbolReplace,
  SafeMap,
  SafePromiseAll,
  SafePromiseAllReturnVoid,
@@ -35,6 +36,7 @@ const {
 }=primordials;
 
 const{ spawn }=require('child_process');
+const{ statSync }=require('fs');
 const{ finished }=require('internal/streams/end-of-stream');
 const{ availableParallelism }=require('os');
 const{ resolve, sep, isAbsolute }=require('path');
@@ -154,6 +156,23 @@ function createTestFileList(patterns, cwd) {
 consthasUserSuppliedPattern=patterns!=null;
 if(!patterns||patterns.length===0){
 patterns=[kDefaultPattern];
+}else{
+patterns=ArrayPrototypeMap(patterns,(pattern)=>{
+// A directory argument is expanded to search for the default test files
+// within it, matching the behavior from before glob patterns were
+// supported. Glob patterns always use forward slashes, so a trailing
+// path separator (of either kind) is stripped before appending.
+constresolved=isAbsolute(pattern) ? pattern : resolve(cwd,pattern);
+try{
+if(statSync(resolved).isDirectory()){
+return`${RegExpPrototypeSymbolReplace(/[\\/]+$/,pattern,'')}/${kDefaultPattern}`;
+}
+}catch{
+// Not a directory or not accessible; leave the pattern as-is so the
+// existing "Could not find" handling still applies.
+}
+returnpattern;
+});
 }
 constglob=newGlob(patterns,{
 __proto__: null,

test/parallel/test-runner-cli.js

@@ -62,6 +62,27 @@ for (const isolation of ['none', 'process']) {
 assert.doesNotMatch(stdout,/ok4-thisshouldpass/);
 }
 
+{
+// A directory argument is searched for the default test files within it,
+// both bare and with a trailing separator.
+// Refs: https://github.com/nodejs/node/issues/64555
+for(constdirof['matching-patterns','matching-patterns/']){
+constargs=['--test','--test-reporter=tap',
+'--no-experimental-strip-types',
+`--test-isolation=${isolation}`,dir];
+constchild=spawnSync(process.execPath,args,{cwd: testFixtures});
+
+assert.strictEqual(child.status,0);
+assert.strictEqual(child.signal,null);
+assert.strictEqual(child.stderr.toString(),'');
+conststdout=child.stdout.toString();
+
+assert.match(stdout,/ok1-thisshouldpass/);
+assert.match(stdout,/ok2-thisshouldpass/);
+assert.match(stdout,/ok3-thisshouldpass/);
+}
+}
+
 {
 // Should match files with "-test.(c|m)(t|j)s" suffix when typescript support is enabled
 constargs=['--test','--test-reporter=tap','--no-warnings',

lib/internal/test_runner/runner.js

@@ -19,6 +19,7 @@ const {
  ObjectAssign,
  PromisePrototypeThen,
  PromiseWithResolvers,
+ RegExpPrototypeSymbolReplace,
  SafeMap,
  SafePromiseAll,
  SafePromiseAllReturnVoid,
@@ -35,6 +36,7 @@ const {
 }=primordials;
 
 const{ spawn }=require('child_process');
+const{ statSync }=require('fs');
 const{ finished }=require('internal/streams/end-of-stream');
 const{ availableParallelism }=require('os');
 const{ resolve, sep, isAbsolute }=require('path');
@@ -154,6 +156,23 @@ function createTestFileList(patterns, cwd) {
 consthasUserSuppliedPattern=patterns!=null;
 if(!patterns||patterns.length===0){
 patterns=[kDefaultPattern];
+}else{
+patterns=ArrayPrototypeMap(patterns,(pattern)=>{
+// A directory argument is expanded to search for the default test files
+// within it, matching the behavior from before glob patterns were
+// supported. Glob patterns always use forward slashes, so a trailing
+// path separator (of either kind) is stripped before appending.
+constresolved=isAbsolute(pattern) ? pattern : resolve(cwd,pattern);
+try{
+if(statSync(resolved).isDirectory()){
+return`${RegExpPrototypeSymbolReplace(/[\\/]+$/,pattern,'')}/${kDefaultPattern}`;
+}
+}catch{
+// Not a directory or not accessible; leave the pattern as-is so the
+// existing "Could not find" handling still applies.
+}
+returnpattern;
+});
 }
 constglob=newGlob(patterns,{
 __proto__: null,

test/parallel/test-runner-cli.js

@@ -62,6 +62,27 @@ for (const isolation of ['none', 'process']) {
 assert.doesNotMatch(stdout,/ok4-thisshouldpass/);
 }
 
+{
+// A directory argument is searched for the default test files within it,
+// both bare and with a trailing separator.
+// Refs: https://github.com/nodejs/node/issues/64555
+for(constdirof['matching-patterns','matching-patterns/']){
+constargs=['--test','--test-reporter=tap',
+'--no-experimental-strip-types',
+`--test-isolation=${isolation}`,dir];
+constchild=spawnSync(process.execPath,args,{cwd: testFixtures});
+
+assert.strictEqual(child.status,0);
+assert.strictEqual(child.signal,null);
+assert.strictEqual(child.stderr.toString(),'');
+conststdout=child.stdout.toString();
+
+assert.match(stdout,/ok1-thisshouldpass/);
+assert.match(stdout,/ok2-thisshouldpass/);
+assert.match(stdout,/ok3-thisshouldpass/);
+}
+}
+
 {
 // Should match files with "-test.(c|m)(t|j)s" suffix when typescript support is enabled
 constargs=['--test','--test-reporter=tap','--no-warnings',

lib/internal/test_runner/runner.js

@@ -19,6 +19,7 @@ const {
  ObjectAssign,
  PromisePrototypeThen,
  PromiseWithResolvers,
+ RegExpPrototypeSymbolReplace,
  SafeMap,
  SafePromiseAll,
  SafePromiseAllReturnVoid,
@@ -35,6 +36,7 @@ const {
 }=primordials;
 
 const{ spawn }=require('child_process');
+const{ statSync }=require('fs');
 const{ finished }=require('internal/streams/end-of-stream');
 const{ availableParallelism }=require('os');
 const{ resolve, sep, isAbsolute }=require('path');
@@ -154,6 +156,23 @@ function createTestFileList(patterns, cwd) {
 consthasUserSuppliedPattern=patterns!=null;
 if(!patterns||patterns.length===0){
 patterns=[kDefaultPattern];
+}else{
+patterns=ArrayPrototypeMap(patterns,(pattern)=>{
+// A directory argument is expanded to search for the default test files
+// within it, matching the behavior from before glob patterns were
+// supported. Glob patterns always use forward slashes, so a trailing
+// path separator (of either kind) is stripped before appending.
+constresolved=isAbsolute(pattern) ? pattern : resolve(cwd,pattern);
+try{
+if(statSync(resolved).isDirectory()){
+return`${RegExpPrototypeSymbolReplace(/[\\/]+$/,pattern,'')}/${kDefaultPattern}`;
+}
+}catch{
+// Not a directory or not accessible; leave the pattern as-is so the
+// existing "Could not find" handling still applies.
+}
+returnpattern;
+});
 }
 constglob=newGlob(patterns,{
 __proto__: null,

test/parallel/test-runner-cli.js

@@ -62,6 +62,27 @@ for (const isolation of ['none', 'process']) {
 assert.doesNotMatch(stdout,/ok4-thisshouldpass/);
 }
 
+{
+// A directory argument is searched for the default test files within it,
+// both bare and with a trailing separator.
+// Refs: https://github.com/nodejs/node/issues/64555
+for(constdirof['matching-patterns','matching-patterns/']){
+constargs=['--test','--test-reporter=tap',
+'--no-experimental-strip-types',
+`--test-isolation=${isolation}`,dir];
+constchild=spawnSync(process.execPath,args,{cwd: testFixtures});
+
+assert.strictEqual(child.status,0);
+assert.strictEqual(child.signal,null);
+assert.strictEqual(child.stderr.toString(),'');
+conststdout=child.stdout.toString();
+
+assert.match(stdout,/ok1-thisshouldpass/);
+assert.match(stdout,/ok2-thisshouldpass/);
+assert.match(stdout,/ok3-thisshouldpass/);
+}
+}
+
 {
 // Should match files with "-test.(c|m)(t|j)s" suffix when typescript support is enabled
 constargs=['--test','--test-reporter=tap','--no-warnings',

lib/internal/test_runner/runner.js

@@ -19,6 +19,7 @@ const {
  ObjectAssign,
  PromisePrototypeThen,
  PromiseWithResolvers,
+ RegExpPrototypeSymbolReplace,
  SafeMap,
  SafePromiseAll,
  SafePromiseAllReturnVoid,
@@ -35,6 +36,7 @@ const {
 }=primordials;
 
 const{ spawn }=require('child_process');
+const{ statSync }=require('fs');
 const{ finished }=require('internal/streams/end-of-stream');
 const{ availableParallelism }=require('os');
 const{ resolve, sep, isAbsolute }=require('path');
@@ -154,6 +156,23 @@ function createTestFileList(patterns, cwd) {
 consthasUserSuppliedPattern=patterns!=null;
 if(!patterns||patterns.length===0){
 patterns=[kDefaultPattern];
+}else{
+patterns=ArrayPrototypeMap(patterns,(pattern)=>{
+// A directory argument is expanded to search for the default test files
+// within it, matching the behavior from before glob patterns were
+// supported. Glob patterns always use forward slashes, so a trailing
+// path separator (of either kind) is stripped before appending.
+constresolved=isAbsolute(pattern) ? pattern : resolve(cwd,pattern);
+try{
+if(statSync(resolved).isDirectory()){
+return`${RegExpPrototypeSymbolReplace(/[\\/]+$/,pattern,'')}/${kDefaultPattern}`;
+}
+}catch{
+// Not a directory or not accessible; leave the pattern as-is so the
+// existing "Could not find" handling still applies.
+}
+returnpattern;
+});
 }
 constglob=newGlob(patterns,{
 __proto__: null,

test/parallel/test-runner-cli.js

@@ -62,6 +62,27 @@ for (const isolation of ['none', 'process']) {
 assert.doesNotMatch(stdout,/ok4-thisshouldpass/);
 }
 
+{
+// A directory argument is searched for the default test files within it,
+// both bare and with a trailing separator.
+// Refs: https://github.com/nodejs/node/issues/64555
+for(constdirof['matching-patterns','matching-patterns/']){
+constargs=['--test','--test-reporter=tap',
+'--no-experimental-strip-types',
+`--test-isolation=${isolation}`,dir];
+constchild=spawnSync(process.execPath,args,{cwd: testFixtures});
+
+assert.strictEqual(child.status,0);
+assert.strictEqual(child.signal,null);
+assert.strictEqual(child.stderr.toString(),'');
+conststdout=child.stdout.toString();
+
+assert.match(stdout,/ok1-thisshouldpass/);
+assert.match(stdout,/ok2-thisshouldpass/);
+assert.match(stdout,/ok3-thisshouldpass/);
+}
+}
+
 {
 // Should match files with "-test.(c|m)(t|j)s" suffix when typescript support is enabled
 constargs=['--test','--test-reporter=tap','--no-warnings',

lib/internal/test_runner/runner.js

@@ -19,6 +19,7 @@ const {
  ObjectAssign,
  PromisePrototypeThen,
  PromiseWithResolvers,
+ RegExpPrototypeSymbolReplace,
  SafeMap,
  SafePromiseAll,
  SafePromiseAllReturnVoid,
@@ -35,6 +36,7 @@ const {
 }=primordials;
 
 const{ spawn }=require('child_process');
+const{ statSync }=require('fs');
 const{ finished }=require('internal/streams/end-of-stream');
 const{ availableParallelism }=require('os');
 const{ resolve, sep, isAbsolute }=require('path');
@@ -154,6 +156,23 @@ function createTestFileList(patterns, cwd) {
 consthasUserSuppliedPattern=patterns!=null;
 if(!patterns||patterns.length===0){
 patterns=[kDefaultPattern];
+}else{
+patterns=ArrayPrototypeMap(patterns,(pattern)=>{
+// A directory argument is expanded to search for the default test files
+// within it, matching the behavior from before glob patterns were
+// supported. Glob patterns always use forward slashes, so a trailing
+// path separator (of either kind) is stripped before appending.
+constresolved=isAbsolute(pattern) ? pattern : resolve(cwd,pattern);
+try{
+if(statSync(resolved).isDirectory()){
+return`${RegExpPrototypeSymbolReplace(/[\\/]+$/,pattern,'')}/${kDefaultPattern}`;
+}
+}catch{
+// Not a directory or not accessible; leave the pattern as-is so the
+// existing "Could not find" handling still applies.
+}
+returnpattern;
+});
 }
 constglob=newGlob(patterns,{
 __proto__: null,

test/parallel/test-runner-cli.js

@@ -62,6 +62,27 @@ for (const isolation of ['none', 'process']) {
 assert.doesNotMatch(stdout,/ok4-thisshouldpass/);
 }
 
+{
+// A directory argument is searched for the default test files within it,
+// both bare and with a trailing separator.
+// Refs: https://github.com/nodejs/node/issues/64555
+for(constdirof['matching-patterns','matching-patterns/']){
+constargs=['--test','--test-reporter=tap',
+'--no-experimental-strip-types',
+`--test-isolation=${isolation}`,dir];
+constchild=spawnSync(process.execPath,args,{cwd: testFixtures});
+
+assert.strictEqual(child.status,0);
+assert.strictEqual(child.signal,null);
+assert.strictEqual(child.stderr.toString(),'');
+conststdout=child.stdout.toString();
+
+assert.match(stdout,/ok1-thisshouldpass/);
+assert.match(stdout,/ok2-thisshouldpass/);
+assert.match(stdout,/ok3-thisshouldpass/);
+}
+}
+
 {
 // Should match files with "-test.(c|m)(t|j)s" suffix when typescript support is enabled
 constargs=['--test','--test-reporter=tap','--no-warnings',

lib/internal/test_runner/runner.js

@@ -19,6 +19,7 @@ const {
  ObjectAssign,
  PromisePrototypeThen,
  PromiseWithResolvers,
+ RegExpPrototypeSymbolReplace,
  SafeMap,
  SafePromiseAll,
  SafePromiseAllReturnVoid,
@@ -35,6 +36,7 @@ const {
 }=primordials;
 
 const{ spawn }=require('child_process');
+const{ statSync }=require('fs');
 const{ finished }=require('internal/streams/end-of-stream');
 const{ availableParallelism }=require('os');
 const{ resolve, sep, isAbsolute }=require('path');
@@ -154,6 +156,23 @@ function createTestFileList(patterns, cwd) {
 consthasUserSuppliedPattern=patterns!=null;
 if(!patterns||patterns.length===0){
 patterns=[kDefaultPattern];
+}else{
+patterns=ArrayPrototypeMap(patterns,(pattern)=>{
+// A directory argument is expanded to search for the default test files
+// within it, matching the behavior from before glob patterns were
+// supported. Glob patterns always use forward slashes, so a trailing
+// path separator (of either kind) is stripped before appending.
+constresolved=isAbsolute(pattern) ? pattern : resolve(cwd,pattern);
+try{
+if(statSync(resolved).isDirectory()){
+return`${RegExpPrototypeSymbolReplace(/[\\/]+$/,pattern,'')}/${kDefaultPattern}`;
+}
+}catch{
+// Not a directory or not accessible; leave the pattern as-is so the
+// existing "Could not find" handling still applies.
+}
+returnpattern;
+});
 }
 constglob=newGlob(patterns,{
 __proto__: null,

test/parallel/test-runner-cli.js

@@ -62,6 +62,27 @@ for (const isolation of ['none', 'process']) {
 assert.doesNotMatch(stdout,/ok4-thisshouldpass/);
 }
 
+{
+// A directory argument is searched for the default test files within it,
+// both bare and with a trailing separator.
+// Refs: https://github.com/nodejs/node/issues/64555
+for(constdirof['matching-patterns','matching-patterns/']){
+constargs=['--test','--test-reporter=tap',
+'--no-experimental-strip-types',
+`--test-isolation=${isolation}`,dir];
+constchild=spawnSync(process.execPath,args,{cwd: testFixtures});
+
+assert.strictEqual(child.status,0);
+assert.strictEqual(child.signal,null);
+assert.strictEqual(child.stderr.toString(),'');
+conststdout=child.stdout.toString();
+
+assert.match(stdout,/ok1-thisshouldpass/);
+assert.match(stdout,/ok2-thisshouldpass/);
+assert.match(stdout,/ok3-thisshouldpass/);
+}
+}
+
 {
 // Should match files with "-test.(c|m)(t|j)s" suffix when typescript support is enabled
 constargs=['--test','--test-reporter=tap','--no-warnings',

lib/internal/test_runner/runner.js

@@ -19,6 +19,7 @@ const {
  ObjectAssign,
  PromisePrototypeThen,
  PromiseWithResolvers,
+ RegExpPrototypeSymbolReplace,
  SafeMap,
  SafePromiseAll,
  SafePromiseAllReturnVoid,
@@ -35,6 +36,7 @@ const {
 }=primordials;
 
 const{ spawn }=require('child_process');
+const{ statSync }=require('fs');
 const{ finished }=require('internal/streams/end-of-stream');
 const{ availableParallelism }=require('os');
 const{ resolve, sep, isAbsolute }=require('path');
@@ -154,6 +156,23 @@ function createTestFileList(patterns, cwd) {
 consthasUserSuppliedPattern=patterns!=null;
 if(!patterns||patterns.length===0){
 patterns=[kDefaultPattern];
+}else{
+patterns=ArrayPrototypeMap(patterns,(pattern)=>{
+// A directory argument is expanded to search for the default test files
+// within it, matching the behavior from before glob patterns were
+// supported. Glob patterns always use forward slashes, so a trailing
+// path separator (of either kind) is stripped before appending.
+constresolved=isAbsolute(pattern) ? pattern : resolve(cwd,pattern);
+try{
+if(statSync(resolved).isDirectory()){
+return`${RegExpPrototypeSymbolReplace(/[\\/]+$/,pattern,'')}/${kDefaultPattern}`;
+}
+}catch{
+// Not a directory or not accessible; leave the pattern as-is so the
+// existing "Could not find" handling still applies.
+}
+returnpattern;
+});
 }
 constglob=newGlob(patterns,{
 __proto__: null,

test/parallel/test-runner-cli.js

@@ -62,6 +62,27 @@ for (const isolation of ['none', 'process']) {
 assert.doesNotMatch(stdout,/ok4-thisshouldpass/);
 }
 
+{
+// A directory argument is searched for the default test files within it,
+// both bare and with a trailing separator.
+// Refs: https://github.com/nodejs/node/issues/64555
+for(constdirof['matching-patterns','matching-patterns/']){
+constargs=['--test','--test-reporter=tap',
+'--no-experimental-strip-types',
+`--test-isolation=${isolation}`,dir];
+constchild=spawnSync(process.execPath,args,{cwd: testFixtures});
+
+assert.strictEqual(child.status,0);
+assert.strictEqual(child.signal,null);
+assert.strictEqual(child.stderr.toString(),'');
+conststdout=child.stdout.toString();
+
+assert.match(stdout,/ok1-thisshouldpass/);
+assert.match(stdout,/ok2-thisshouldpass/);
+assert.match(stdout,/ok3-thisshouldpass/);
+}
+}
+
 {
 // Should match files with "-test.(c|m)(t|j)s" suffix when typescript support is enabled
 constargs=['--test','--test-reporter=tap','--no-warnings',

lib/internal/test_runner/runner.js

@@ -19,6 +19,7 @@ const {
  ObjectAssign,
  PromisePrototypeThen,
  PromiseWithResolvers,
+ RegExpPrototypeSymbolReplace,
  SafeMap,
  SafePromiseAll,
  SafePromiseAllReturnVoid,
@@ -35,6 +36,7 @@ const {
 }=primordials;
 
 const{ spawn }=require('child_process');
+const{ statSync }=require('fs');
 const{ finished }=require('internal/streams/end-of-stream');
 const{ availableParallelism }=require('os');
 const{ resolve, sep, isAbsolute }=require('path');
@@ -154,6 +156,23 @@ function createTestFileList(patterns, cwd) {
 consthasUserSuppliedPattern=patterns!=null;
 if(!patterns||patterns.length===0){
 patterns=[kDefaultPattern];
+}else{
+patterns=ArrayPrototypeMap(patterns,(pattern)=>{
+// A directory argument is expanded to search for the default test files
+// within it, matching the behavior from before glob patterns were
+// supported. Glob patterns always use forward slashes, so a trailing
+// path separator (of either kind) is stripped before appending.
+constresolved=isAbsolute(pattern) ? pattern : resolve(cwd,pattern);
+try{
+if(statSync(resolved).isDirectory()){
+return`${RegExpPrototypeSymbolReplace(/[\\/]+$/,pattern,'')}/${kDefaultPattern}`;
+}
+}catch{
+// Not a directory or not accessible; leave the pattern as-is so the
+// existing "Could not find" handling still applies.
+}
+returnpattern;
+});
 }
 constglob=newGlob(patterns,{
 __proto__: null,

test/parallel/test-runner-cli.js

@@ -62,6 +62,27 @@ for (const isolation of ['none', 'process']) {
 assert.doesNotMatch(stdout,/ok4-thisshouldpass/);
 }
 
+{
+// A directory argument is searched for the default test files within it,
+// both bare and with a trailing separator.
+// Refs: https://github.com/nodejs/node/issues/64555
+for(constdirof['matching-patterns','matching-patterns/']){
+constargs=['--test','--test-reporter=tap',
+'--no-experimental-strip-types',
+`--test-isolation=${isolation}`,dir];
+constchild=spawnSync(process.execPath,args,{cwd: testFixtures});
+
+assert.strictEqual(child.status,0);
+assert.strictEqual(child.signal,null);
+assert.strictEqual(child.stderr.toString(),'');
+conststdout=child.stdout.toString();
+
+assert.match(stdout,/ok1-thisshouldpass/);
+assert.match(stdout,/ok2-thisshouldpass/);
+assert.match(stdout,/ok3-thisshouldpass/);
+}
+}
+
 {
 // Should match files with "-test.(c|m)(t|j)s" suffix when typescript support is enabled
 constargs=['--test','--test-reporter=tap','--no-warnings',