Bug 1916277 - Part 15: Add/Update Mochitest tests. r=jonco,frontend-codestyle-reviewers

allstarschh · allstarschh · commit 62eb44522bda · 2026-03-03T00:53:00.000Z
Updating the tests with multiple import maps. Differential Revision: https://phabricator.services.mozilla.com/D272784
diff --git a/dom/base/test/jsmodules/importmaps/module_importMap_with_external_script_6.mjs b/dom/base/test/jsmodules/importmaps/module_importMap_with_external_script_6.mjs
@@ -1,3 +1 @@
-// Existing file ./bad/module_3.mjs should be mapped to ./good/module_3.mjs.
-//import {} from "./bad/module_3.mjs";
 throw "Error: script_6.mjs";
diff --git a/dom/base/test/jsmodules/importmaps/module_importMap_with_external_script_7.mjs b/dom/base/test/jsmodules/importmaps/module_importMap_with_external_script_7.mjs
@@ -1,3 +1,3 @@
-// Existing file ./bad/module_7.mjs should be mapped to ./good/module_4.mjs.
+// Existing file ./bad/module_7.mjs should be mapped to ./good/module_7.mjs.
 // eslint-disable-next-line import/no-unassigned-import
 import {} from "./bad/module_7.mjs";
diff --git a/dom/base/test/jsmodules/importmaps/multiple/chrome.toml b/dom/base/test/jsmodules/importmaps/multiple/chrome.toml
@@ -0,0 +1,20 @@
+[DEFAULT]
+support-files = [
+  "import_circular.mjs",
+  "import_circular_1.mjs",
+  "module_simpleExport.mjs",
+  "module_simpleExport_2.mjs",
+  "module_simpleImport.mjs",
+]
+
+prefs = ["dom.multiple_import_maps.enabled=true"]
+
+["test_importMap_after_module_load.html"]
+
+["test_importMap_between_dynamic_imports.html"]
+
+["test_importMap_between_inline_modules.html"]
+
+["test_importMap_circular.html"]
+
+["test_multiple_importMaps.html"]
diff --git a/dom/base/test/jsmodules/importmaps/multiple/import_circular.mjs b/dom/base/test/jsmodules/importmaps/multiple/import_circular.mjs
@@ -0,0 +1 @@
+export { a } from "./import_circular_1.mjs";
diff --git a/dom/base/test/jsmodules/importmaps/multiple/import_circular_1.mjs b/dom/base/test/jsmodules/importmaps/multiple/import_circular_1.mjs
@@ -0,0 +1 @@
+export { a } from "./import_circular.mjs";
diff --git a/dom/base/test/jsmodules/importmaps/multiple/module_simpleExport.mjs b/dom/base/test/jsmodules/importmaps/multiple/module_simpleExport.mjs
@@ -0,0 +1 @@
+export let x = 42;
diff --git a/dom/base/test/jsmodules/importmaps/multiple/module_simpleExport_2.mjs b/dom/base/test/jsmodules/importmaps/multiple/module_simpleExport_2.mjs
@@ -0,0 +1 @@
+export let x = 84;
diff --git a/dom/base/test/jsmodules/importmaps/multiple/module_simpleImport.mjs b/dom/base/test/jsmodules/importmaps/multiple/module_simpleImport.mjs
@@ -0,0 +1,4 @@
+import { x } from "./module_simpleExport.mjs";
+
+// eslint-disable-next-line no-undef
+result = x;
diff --git a/dom/base/test/jsmodules/importmaps/multiple/moz.build b/dom/base/test/jsmodules/importmaps/multiple/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MOCHITEST_CHROME_MANIFESTS += ["chrome.toml"]
diff --git a/dom/base/test/jsmodules/importmaps/multiple/test_importMap_after_module_load.html b/dom/base/test/jsmodules/importmaps/multiple/test_importMap_after_module_load.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<head>
+  <meta charset=utf-8>
+  <title>Test a top-level module load before and after an import map</title>
+</head>
+<body onload='testLoaded()'>
+<script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+
+<script>var result;</script>
+
+<!--This is a module load before the import map tag-->
+<!--It will import "./module_simpleExport.mjs", which makes "module_simpleExport.mjs"-->
+<!--as a resolved module.-->
+<script src="./module_simpleImport.mjs" type="module">
+</script>
+
+<script>
+// eslint-disable-next-line no-unused-vars
+let gotMsg = false;
+let console = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
+let listener = {
+  QueryInterface: ChromeUtils.generateQI(["nsIConsoleListener"]),
+  observe(msg) {
+    info("console message:" + msg);
+    ok(msg.logLevel == Ci.nsIConsoleMessage.warn, "log level should be 'warn'.");
+    console.unregisterListener(this);
+    gotMsg = true;
+  }
+};
+console.registerListener(listener);
+</script>
+
+<script type="importmap" onerror='importMapError()'>
+{
+  "imports": {
+    "./module_simpleExport.mjs": "./scope1/module_simpleExport.mjs"
+  }
+}
+</script>
+
+<script>
+  /* global gotMsg */
+  SimpleTest.waitForExplicitFinish();
+
+  let hasError = false;
+  // eslint-disable-next-line no-unused-vars
+  function importMapError() {
+    hasError = true;
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  function testLoaded() {
+    import("./module_simpleExport.mjs").then((ns) => {
+      ok(ns.x == 42, 'Check simple imported value result: ' + ns.x);
+      ok(!hasError, "onerror of the import map shouldn't be called.");
+      ok(gotMsg, "Should have got the console warning.");
+    }).catch((e) => {
+      ok(false, "throws " + e);
+    }).then(() => {
+      SimpleTest.finish();
+    });
+  }
+</script>
+</body>
diff --git a/dom/base/test/jsmodules/importmaps/multiple/test_importMap_between_dynamic_imports.html b/dom/base/test/jsmodules/importmaps/multiple/test_importMap_between_dynamic_imports.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<head>
+  <meta charset=utf-8>
+  <title>Test import map's entry is ignored if the specifier has been resolved.</title>
+</head>
+<body onload='testLoaded()'>
+<script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+
+<script>
+  import("./module_simpleExport.mjs").then((ns) => {
+    ok(ns.x == 42, 'Check imported value result before registering an import map: ' + ns.x);
+  }).catch((e) => {
+    ok(false, "throws " + e);
+  })
+</script>
+
+<!-- module_simpleExport.mjs has been resolved, so the entry -->
+<!-- "./module_simpleExport.mjs" in the import map won't be added. -->
+
+<script type="importmap" onerror='importMapError()'>
+{
+  "imports": {
+    "./module_simpleExport.mjs": "./scope1/module_simpleExport.mjs"
+  }
+}
+</script>
+
+<script>
+  SimpleTest.waitForExplicitFinish();
+
+  let hasError = false;
+  // eslint-disable-next-line no-unused-vars
+  function importMapError() {
+    hasError = true;
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  function testLoaded() {
+    // doing import() again should get the same result, regardless the import map.
+    import("./module_simpleExport.mjs").then((ns) => {
+      ok(ns.x == 42, 'Check simple imported value result after registering an import map: ' + ns.x);
+      ok(!hasError, "onerror of the import map shouldn't be called.");
+    }).catch((e) => {
+      ok(false, "throws " + e);
+    }).then(() => {
+      SimpleTest.finish();
+    });
+  }
+</script>
+</body>
diff --git a/dom/base/test/jsmodules/importmaps/multiple/test_importMap_between_inline_modules.html b/dom/base/test/jsmodules/importmaps/multiple/test_importMap_between_inline_modules.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<head>
+  <meta charset=utf-8>
+  <title>Test import map should be rejected.</title>
+</head>
+<body onload='testLoaded()'>
+<script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+
+<script>
+// eslint-disable-next-line no-unused-vars
+let gotMsg = false;
+let console = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
+let listener = {
+  QueryInterface: ChromeUtils.generateQI(["nsIConsoleListener"]),
+  observe(msg) {
+    info("console message:" + msg);
+    ok(msg.logLevel == Ci.nsIConsoleMessage.warn, "log level should be 'warn'.");
+    console.unregisterListener(this);
+    gotMsg = true;
+  }
+};
+console.registerListener(listener);
+</script>
+
+<!--There is an inline module before the import map tag. -->
+<script type="module"></script>
+
+<script type="importmap" onerror='importMapError()'>
+{
+  "imports": {
+    "./module_simpleExport.mjs": "./module_simpleExport_2.mjs"
+  }
+}
+</script>
+
+<!-- A duplicated entry -->
+<script type="importmap" onerror='importMapError()'>
+{
+  "imports": {
+    "./module_simpleExport.mjs": "./module_simpleExport.mjs"
+  }
+}
+</script>
+
+<script>
+  /* global gotMsg */
+  SimpleTest.waitForExplicitFinish();
+
+  let hasError = false;
+  // eslint-disable-next-line no-unused-vars
+  function importMapError() {
+    hasError = true;
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  function testLoaded() {
+    import("./module_simpleExport.mjs").then((ns) => {
+      ok(ns.x == 84, 'Check simple imported value result: ' + ns.x);
+      ok(!hasError, "onerror of the import map shouldn't be called.");
+      ok(gotMsg, "Should have got the console warning.");
+    }).catch((e) => {
+      ok(false, "throws " + e);
+    }).then(() => {
+      SimpleTest.finish();
+    });
+  }
+</script>
+</body>
diff --git a/dom/base/test/jsmodules/importmaps/multiple/test_importMap_circular.html b/dom/base/test/jsmodules/importmaps/multiple/test_importMap_circular.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Test module import error message</title>
+<script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+<script>
+  SimpleTest.waitForExplicitFinish();
+
+  let count = 0;
+
+  window.onerror = function (event, src, lineno, colno, error) {
+    info("window.onerror: message: " + error.message);
+    info("window.onerror: src: " + src);
+    ok(error instanceof SyntaxError, "Should be a SyntaxError.");
+
+    if (src.match("import_circular_1.mjs")) {
+      ok(error.message.match("contains circular import"));
+    } else {
+      ok(false, "unknown src " + src);
+    }
+    count++;
+  };
+
+  // eslint-disable-next-line no-unused-vars
+  function testLoaded() {
+    ok(count === 1, "Should have 1 SynaxError thrown.");
+    SimpleTest.finish();
+  }
+
+  const script = document.createElement('script');
+  script.type = 'importmap';
+  script.textContent =
+  `{
+    "imports": {
+      "foo": "bar"
+    }
+  }`;
+  document.head.appendChild(script);
+</script>
+
+<script type="module" src="import_circular.mjs"></script>
+<body onload='testLoaded()'></body>
diff --git a/dom/base/test/jsmodules/importmaps/multiple/test_multiple_importMaps.html b/dom/base/test/jsmodules/importmaps/multiple/test_multiple_importMaps.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<head>
+  <meta charset=utf-8>
+  <title>Test the 2nd import map should be accepted.</title>
+</head>
+<body onload='testLoaded()'>
+<script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+
+<script>
+// eslint-disable-next-line no-unused-vars
+let gotMsg = false;
+let console = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
+let listener = {
+  QueryInterface: ChromeUtils.generateQI(["nsIConsoleListener"]),
+  observe(msg) {
+    info("console message:" + msg);
+    ok(msg.logLevel == Ci.nsIConsoleMessage.warn, "log level should be 'warn'.");
+    console.unregisterListener(this);
+    gotMsg = true;
+  }
+};
+console.registerListener(listener);
+</script>
+
+<script type="importmap" onerror='importMapError1()'>
+{
+  "imports": {
+    "./export.mjs": "./module_simpleExport.mjs"
+  }
+}
+</script>
+
+<!--
+The 2nd import map:
+The first entry "./module_simpleExport.mjs" will be ignored due to conflict with
+the first import map.
+The second entry will be merged.
+-->
+<script type="importmap" onerror='importMapError2()'>
+{
+  "imports": {
+    "./export.mjs": "./module_simpleExport_2.mjs",
+    "simple": "./module_simpleExport.mjs"
+  }
+}
+</script>
+
+<script>
+  /* global gotMsg */
+  SimpleTest.waitForExplicitFinish();
+
+  let hasError = false;
+  // eslint-disable-next-line no-unused-vars
+  function importMapError1() {
+    ok(false, "The first import map should be accepted.");
+  }
+  // eslint-disable-next-line no-unused-vars
+  function importMapError2() {
+    hasError = true;
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  function testLoaded() {
+    import("./export.mjs").then((ns) => {
+      ok(ns.x == 42, 'Check export.mjs imported value result: ' + ns.x);
+      ok(!hasError, "onerror of the 2nd import map shouldn't be called.");
+
+      // There should be a warning for the conflict in the 2nd import map.
+      ok(gotMsg, "Should have got the console warning.");
+      return import("simple");
+    }).then((ns) => {
+      ok(ns.x == 42, 'Check simple imported value result: ' + ns.x);
+    }).catch((e) => {
+      ok(false, "throws " + e);
+    }).then(() => {
+      SimpleTest.finish();
+    });
+  }
+</script>
+</body>
diff --git a/dom/base/test/jsmodules/importmaps/test_dynamic_import_reject_importMap.html b/dom/base/test/jsmodules/importmaps/test_dynamic_import_reject_importMap.html
diff --git a/dom/base/test/jsmodules/importmaps/test_inline_module_reject_importMap.html b/dom/base/test/jsmodules/importmaps/test_inline_module_reject_importMap.html
diff --git a/dom/base/test/jsmodules/importmaps/test_module_script_reject_importMap.html b/dom/base/test/jsmodules/importmaps/test_module_script_reject_importMap.html
diff --git a/dom/base/test/jsmodules/importmaps/test_reject_multiple_importMaps.html b/dom/base/test/jsmodules/importmaps/test_reject_multiple_importMaps.html
diff --git a/dom/base/test/moz.build b/dom/base/test/moz.build
diff --git a/eslint-ignores.config.mjs b/eslint-ignores.config.mjs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`		`-// Existing file ./bad/module_3.mjs should be mapped to ./good/module_3.mjs.`
`2`		`-//import {} from "./bad/module_3.mjs";`
`3`	`1`	`throw "Error: script_6.mjs";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { a } from "./import_circular_1.mjs";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { a } from "./import_circular.mjs";`