test: hotTest and watchTest no longer auto setup jsdom env (#19676)

test/HotTestCases.template.js

@@ -157,8 +157,7 @@ const describeCases = config => {
 									outputDirectory,
 									testMeta: {
 										category: category.name,
-										name: testName,
+										name: testName
-										env: "jsdom"
 									},
 									testConfig: {
 										...testConfig,
@@ -167,6 +166,10 @@ const describeCases = config => {
 									webpackOptions: options
 								});
 
+								if (testConfig.moduleScope) {
+									testConfig.moduleScope(runner._moduleScope, options);
+								}
+
 								function _next(callback) {
 									fakeUpdateLoaderOptions.updateIndex++;
 									compiler.run((err, stats) => {

test/WatchTestCases.template.js

@@ -305,8 +305,7 @@ const describeCases = config => {
 											outputDirectory,
 											testMeta: {
 												category: category.name,
-												name: testName,
+												name: testName
-												env: "jsdom"
 											},
 											testConfig: {
 												...testConfig,

test/hotCases/css/css-modules/test.config.js

@@ -4,5 +4,6 @@ module.exports = {
 		link.rel = "stylesheet";
 		link.href = "https://test.cases/path/bundle.css";
 		scope.window.document.head.appendChild(link);
-	}
+	},
+	env: "jsdom"
 };

test/hotCases/css/fetch-priority/test.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	env: "jsdom"
+};

test/hotCases/css/imported-css/test.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	env: "jsdom"
+};

test/hotCases/css/single-css-entry/test.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	env: "jsdom"
+};

test/hotCases/css/vanilla/test.config.js

@@ -4,5 +4,6 @@ module.exports = {
 		link.rel = "stylesheet";
 		link.href = "https://test.cases/path/bundle.css";
 		scope.window.document.head.appendChild(link);
-	}
+	},
+	env: "jsdom"
 };

test/hotCases/esm-output/css-modules/test.config.js

@@ -4,5 +4,6 @@ module.exports = {
 		link.rel = "stylesheet";
 		link.href = "https://test.cases/path/bundle.css";
 		scope.window.document.head.appendChild(link);
-	}
+	},
+	env: "jsdom"
 };

test/hotCases/worker/move-between-runtime/test.config.js

@@ -0,0 +1,9 @@
+module.exports = {
+	moduleScope(scope, options) {
+		const FakeWorker = require("../../../helpers/createFakeWorker")({
+			outputDirectory: options.output.path
+		});
+
+		scope.Worker = FakeWorker;
+	}
+};

test/hotCases/worker/remove-add-worker/test.config.js

@@ -0,0 +1,9 @@
+module.exports = {
+	moduleScope(scope, options) {
+		const FakeWorker = require("../../../helpers/createFakeWorker")({
+			outputDirectory: options.output.path
+		});
+
+		scope.Worker = FakeWorker;
+	}
+};

test/hotCases/worker/update-in-worker/test.config.js

@@ -0,0 +1,9 @@
+module.exports = {
+	moduleScope(scope, options) {
+		const FakeWorker = require("../../../helpers/createFakeWorker")({
+			outputDirectory: options.output.path
+		});
+
+		scope.Worker = FakeWorker;
+	}
+};

test/runner/index.js

@@ -58,7 +58,6 @@ const urlToRelativePath = url => {
  * @typedef {object} TestMeta
  * @property {string} category
  * @property {string} name
- * @property {"jsdom"=} env
  * @property {number=} round
  */
 
@@ -68,6 +67,7 @@ const urlToRelativePath = url => {
  * @property {EXPECTED_FUNCTION=} moduleScope
  * @property {EXPECTED_FUNCTION=} nonEsmThis
  * @property {boolean=} evaluateScriptOnAttached
+ * @property {"jsdom"=} env
  */
 
 /**
@@ -110,15 +110,25 @@ class TestRunner {
 		testConfig,
 		webpackOptions
 	}) {
+		/** @type {string|string[]} */
 		this.target = target;
+		/** @type {string} */
 		this.outputDirectory = outputDirectory;
+		/** @type {TestConfig} */
 		this.testConfig = testConfig || {};
+		/** @type {TestMeta} */
 		this.testMeta = testMeta || {};
+		/** @type {EXPECTED_ANY} */
 		this.webpackOptions = webpackOptions || {};
+		/** @type {boolean} */
 		this._runInNewContext = this.isTargetWeb();
+		/** @type {EXPECTED_ANY} */
 		this._globalContext = this.createBaseGlobalContext();
+		/** @type {EXPECTED_ANY} */
 		this._moduleScope = this.createBaseModuleScope();
+		/** @type {ModuleRunner} */
 		this._moduleRunners = this.createModuleRunners();
+		/** @type {EXPECTED_ANY} */
 		this._esmContext = this.createBaseEsmContext();
 	}
 
@@ -167,7 +177,7 @@ class TestRunner {
 	 * @returns {boolean} whether env is jsdom
 	 */
 	jsDom() {
-		return this.testMeta.env === "jsdom" || this.isTargetWeb();
+		return this.testConfig.env === "jsdom" || this.isTargetWeb();
 	}
 
 	/**