test_runner: unify --require and --import behavior when isolation none

Author: pmarchini

lib/internal/main/test_runner.js

@@ -5,18 +5,23 @@ const {
 } = primordials;
 
 const {
-  prepareMainThreadExecution,
   markBootstrapComplete,
+  prepareTestRunnerMainExecution,
 } = require('internal/process/pre_execution');
 const { isUsingInspector } = require('internal/util/inspector');
 const { run } = require('internal/test_runner/runner');
 const { parseCommandLine } = require('internal/test_runner/utils');
+const { getOptionValue } = require('internal/options');
 const { exitCodes: { kGenericUserError } } = internalBinding('errors');
 let debug = require('internal/util/debuglog').debuglog('test_runner', (fn) => {
   debug = fn;
 });
 
-prepareMainThreadExecution(false);
+const isTestIsolationNone = getOptionValue('--test-isolation') === 'none';
+
+// We set initializeModules to false as we want to load user modules in the test runner run function
+// if we are running with --test-isolation=none
+prepareTestRunnerMainExecution(!isTestIsolationNone);
 markBootstrapComplete();
 
 const options = parseCommandLine();

lib/internal/process/pre_execution.js

@@ -50,6 +50,15 @@ function prepareMainThreadExecution(expandArgv1 = false, initializeModules = tru
   });
 }
 
+function prepareTestRunnerMainExecution(loadUserModules = true) {
+  return prepareExecution({
+    expandArgv1: false,
+    initializeModules: true,
+    isMainThread: true,
+    forceDefaultLoader: !loadUserModules,
+  });
+}
+
 function prepareWorkerThreadExecution() {
   prepareExecution({
     expandArgv1: false,
@@ -87,7 +96,7 @@ function prepareShadowRealmExecution() {
 }
 
 function prepareExecution(options) {
-  const { expandArgv1, initializeModules, isMainThread } = options;
+  const { expandArgv1, initializeModules, isMainThread, forceDefaultLoader } = options;
 
   refreshRuntimeOptions();
 
@@ -147,7 +156,7 @@ function prepareExecution(options) {
   }
 
   if (initializeModules) {
-    setupUserModules();
+    setupUserModules(forceDefaultLoader);
   }
 
   return mainEntry;
@@ -712,6 +721,7 @@ module.exports = {
   prepareMainThreadExecution,
   prepareWorkerThreadExecution,
   prepareShadowRealmExecution,
+  prepareTestRunnerMainExecution,
   markBootstrapComplete,
   loadPreloadModules,
   initializeFrozenIntrinsics,

lib/internal/test_runner/runner.js

@@ -765,9 +765,15 @@ function run(options = kEmptyObject) {
             SafePromiseAllReturnVoid([root.harness.bootstrapPromise, promise]) :
             promise;
 
-          const userImports = getOptionValue('--import');
-          for (let i = 0; i < userImports.length; i++) {
-            await cascadedLoader.import(userImports[i], parentURL, kEmptyObject);
+          // We need to setup the user modules in the test runner if we are running with
+          // --test-isolation=none and --test in order to avoid loading the user modules
+          // before the creation of the root test.
+          const userModules = [
+            ...getOptionValue('--require'),
+            ...getOptionValue('--import'),
+          ];
+          for (let i = 0; i < userModules.length; i++) {
+            await cascadedLoader.import(userModules[i], parentURL, kEmptyObject);
           }
 
           for (let i = 0; i < testFiles.length; ++i) {

test/known_issues/test-runner-no-isolation-hooks.mjs

@@ -68,3 +68,15 @@ test('use --import (ESM) to define global hooks', async (t) => {
 
   t.assert.equal(testHookOutput, order);
 });
+
+test('use --require to define global hooks', async (t) => {
+  const { stdout } = await common.spawnPromisified(process.execPath, [
+    ...testArguments,
+    '--require', fixtures.path('test-runner', 'no-isolation', 'global-hooks.cjs'),
+    ...testFiles,
+  ]);
+
+  const testHookOutput = stdout.split('\n▶')[0];
+
+  t.assert.equal(testHookOutput, order);
+});