Bug 1843794 - Rewrite editor/AsyncSpellCheckTestHelper.sys.mjs consumers in html/xhtml to use ChromeUtils.importESModule. r=masayuki

Depends on D183689 Differential Revision: https://phabricator.services.mozilla.com/D183690
2024-11-28 15:23:51 +00:00 · 2023-07-19 00:43:33 +00:00 · 2023-07-19 00:43:33 +00:00 · d984b79117
commit d984b79117
parent d32481d262
44 changed files with 88 additions and 88 deletions
--- a/editor/libeditor/crashtests/1444630.html
+++ b/editor/libeditor/crashtests/1444630.html
@ -7,8 +7,8 @@ function load()
  let textarea = document.getElementById("editor");
  textarea.focus();

-  const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://reftest/AsyncSpellCheckTestHelper.jsm"
+  const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://reftest/AsyncSpellCheckTestHelper.sys.mjs"
  );
  maybeOnSpellCheck(textarea, () => {
    let isc = SpecialPowers.wrap(textarea).editor.getInlineSpellChecker(false);
--- a/editor/libeditor/tests/test_textarea_value_not_include_cr.html
+++ b/editor/libeditor/tests/test_textarea_value_not_include_cr.html
@ -72,8 +72,8 @@ SimpleTest.waitForFocus(async () => {
    let inlineSpellchecker = SpecialPowers.wrap(textarea).editor.getInlineSpellChecker(true);
    textarea.value = "abx ";
    await new Promise(resolve => {
-      const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
-        "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+      const { onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+        "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
      );
      onSpellCheck(textarea, () => {
        SimpleTest.executeSoon(resolve);
--- a/editor/libeditor/tests/test_undo_after_spellchecker_replaces_word.html
+++ b/editor/libeditor/tests/test_undo_after_spellchecker_replaces_word.html
@ -93,8 +93,8 @@ SimpleTest.waitForFocus(async () => {
        return aElement === textarea ? aElement.value : aElement.innerHTML;
      }

-      const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-        "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+      const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+        "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
      );
      maybeOnSpellCheck(aElement, () => {
        SimpleTest.executeSoon(() => {
--- a/editor/spellchecker/tests/test_async_UpdateCurrentDictionary.html
+++ b/editor/spellchecker/tests/test_async_UpdateCurrentDictionary.html
@ -24,8 +24,8 @@ function start() {
  var textarea = document.getElementById("editor");
  textarea.focus();

-  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  )
  onSpellCheck(textarea, function() {
    var isc = SpecialPowers.wrap(textarea).editor.getInlineSpellChecker(false);
--- a/editor/spellchecker/tests/test_bug1100966.html
+++ b/editor/spellchecker/tests/test_bug1100966.html
@ -23,8 +23,8 @@ fivee sixx<br>

 <script class="testbody" type="application/javascript">

-let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 /** Test for Bug 1100966 **/
--- a/editor/spellchecker/tests/test_bug1154791.html
+++ b/editor/spellchecker/tests/test_bug1154791.html
@ -22,8 +22,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1154791

 <script class="testbody" type="application/javascript">

-let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 /** Test for Bug 1154791 **/
--- a/editor/spellchecker/tests/test_bug1200533.html
+++ b/editor/spellchecker/tests/test_bug1200533.html
@ -106,8 +106,8 @@ function continueTest(evt) {
  var inlineSpellChecker = editor.getInlineSpellChecker(true);
  const is_en_US = SpecialPowers.Services.locale.appLocaleAsBCP47 == "en-US";

-  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  onSpellCheck(elem, async function() {
    var spellchecker = inlineSpellChecker.spellChecker;
--- a/editor/spellchecker/tests/test_bug1204147.html
+++ b/editor/spellchecker/tests/test_bug1204147.html
@ -69,8 +69,8 @@ var loadListener = async function(evt) {
  editor.setSpellcheckUserOverride(true);
  var inlineSpellChecker = editor.getInlineSpellChecker(true);

-  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  onSpellCheck(elem, async function() {
    let spellchecker = inlineSpellChecker.spellChecker;
--- a/editor/spellchecker/tests/test_bug1205983.html
+++ b/editor/spellchecker/tests/test_bug1205983.html
@ -28,8 +28,8 @@ var editor_de;
 var selcon_de;
 var script;

-var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 /** Test for Bug 1205983 **/
--- a/editor/spellchecker/tests/test_bug1209414.html
+++ b/editor/spellchecker/tests/test_bug1209414.html
@ -36,8 +36,8 @@ var script;
 * user behaviour.
 */

-let { maybeOnSpellCheck, onSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+let { maybeOnSpellCheck, onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 SimpleTest.waitForExplicitFinish();
--- a/editor/spellchecker/tests/test_bug1219928.html
+++ b/editor/spellchecker/tests/test_bug1219928.html
@ -29,8 +29,8 @@ var spellchecker;

 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(function() {
-  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );

  var elem = document.getElementById("en-US");
--- a/editor/spellchecker/tests/test_bug1365383.html
+++ b/editor/spellchecker/tests/test_bug1365383.html
@ -29,8 +29,8 @@ SimpleTest.waitForFocus(() => {

  textarea.focus();

-  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  onSpellCheck(textarea, () => {
    // Callback parameter isn't set
--- a/editor/spellchecker/tests/test_bug1368544.html
+++ b/editor/spellchecker/tests/test_bug1368544.html
@ -30,8 +30,8 @@ SimpleTest.waitForFocus(() => {

  textarea.focus();

-  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  onSpellCheck(textarea, () => {
    spellChecker.UpdateCurrentDictionary(() => {
--- a/editor/spellchecker/tests/test_bug1402822.html
+++ b/editor/spellchecker/tests/test_bug1402822.html
@ -21,8 +21,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1402822

 const Ci = SpecialPowers.Ci;

-let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 function getMisspelledWords(editor) {
--- a/editor/spellchecker/tests/test_bug1418629.html
+++ b/editor/spellchecker/tests/test_bug1418629.html
@ -19,8 +19,8 @@
 <div id="edit1" contenteditable=true></div>

 <script>
-const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 SimpleTest.waitForExplicitFinish();
--- a/editor/spellchecker/tests/test_bug1497480.html
+++ b/editor/spellchecker/tests/test_bug1497480.html
@ -23,8 +23,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1497480

 /** Test for Bug 1497480 **/
 let gMisspeltWords = [];
-let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 const template = document.createElement("template");
--- a/editor/spellchecker/tests/test_bug1602526.html
+++ b/editor/spellchecker/tests/test_bug1602526.html
@ -17,8 +17,8 @@
 <div id="contenteditable" contenteditable=true>kkkk&#xf6;kkkk</div>

 <script>
-const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 SimpleTest.waitForExplicitFinish();
--- a/editor/spellchecker/tests/test_bug1761273.html
+++ b/editor/spellchecker/tests/test_bug1761273.html
@ -24,8 +24,8 @@ const Ci = SpecialPowers.Ci;
 let {
  getDictionaryContentPref,
  onSpellCheck,
-} = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+} = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 /** Test for Bug 1402822 **/
--- a/editor/spellchecker/tests/test_bug1773802.html
+++ b/editor/spellchecker/tests/test_bug1773802.html
@ -22,8 +22,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1773802

 const Ci = SpecialPowers.Ci;

-let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 function getMisspelledWords(editor) {
--- a/editor/spellchecker/tests/test_bug338427.html
+++ b/editor/spellchecker/tests/test_bug338427.html
@ -20,8 +20,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=338427

 /** Test for Bug 338427 **/
 function init() {
-    var { onSpellCheck } = SpecialPowers.ChromeUtils.import(
-      "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+    var { onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+      "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
    );
    var textarea = document.getElementById("editor");
    var editor = SpecialPowers.wrap(textarea).editor;
--- a/editor/spellchecker/tests/test_bug366682.html
+++ b/editor/spellchecker/tests/test_bug366682.html
@ -45,8 +45,8 @@ function runTest() {
  editDoc().designMode = "on";
  editDoc().defaultView.focus();

-  const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  maybeOnSpellCheck(editDoc().documentElement, evalTest);
 }
--- a/editor/spellchecker/tests/test_bug432225.html
+++ b/editor/spellchecker/tests/test_bug432225.html
@ -21,8 +21,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=432225

 /** Test for Bug 432225 **/

-let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 SimpleTest.waitForExplicitFinish();
--- a/editor/spellchecker/tests/test_bug484181.html
+++ b/editor/spellchecker/tests/test_bug484181.html
@ -46,8 +46,8 @@ function runTest() {
  var edit = document.getElementById("edit");
  edit.focus();

-  const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  maybeOnSpellCheck(edit, function() {
    ok(isSpellingCheckOk(getEditor(), gMisspeltWords),
--- a/editor/spellchecker/tests/test_bug596333.html
+++ b/editor/spellchecker/tests/test_bug596333.html
@ -121,8 +121,8 @@ function runTest() {
  var edit = document.getElementById("edit");
  edit.focus();

-  onSpellCheck = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  onSpellCheck = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  ).onSpellCheck;
  onSpellCheck(edit, runOnFocus);
 }
--- a/editor/spellchecker/tests/test_bug636465.html
+++ b/editor/spellchecker/tests/test_bug636465.html
@ -11,8 +11,8 @@
 SimpleTest.waitForExplicitFinish();

 function runTest() {
-  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  var x = document.getElementById("x");
  x.focus();
--- a/editor/spellchecker/tests/test_bug678842.html
+++ b/editor/spellchecker/tests/test_bug678842.html
@ -62,8 +62,8 @@ var loadListener = async function(evt) {
  editor.setSpellcheckUserOverride(true);
  var inlineSpellChecker = editor.getInlineSpellChecker(true);

-  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  onSpellCheck(elem, async function() {
    let spellchecker = inlineSpellChecker.spellChecker;
--- a/editor/spellchecker/tests/test_bug697981.html
+++ b/editor/spellchecker/tests/test_bug697981.html
@ -27,8 +27,8 @@ var elem_de;
 var editor_de;
 var script;

-var { maybeOnSpellCheck, onSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+var { maybeOnSpellCheck, onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 /** Test for Bug 697981 **/
--- a/editor/spellchecker/tests/test_bug717433.html
+++ b/editor/spellchecker/tests/test_bug717433.html
@ -63,8 +63,8 @@ var loadListener = async function(evt) {
  editor.setSpellcheckUserOverride(true);
  var inlineSpellChecker = editor.getInlineSpellChecker(true);

-  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  onSpellCheck(elem, async function() {
    let spellchecker = inlineSpellChecker.spellChecker;
--- a/editor/spellchecker/tests/test_multiple_content_languages.html
+++ b/editor/spellchecker/tests/test_multiple_content_languages.html
@ -106,8 +106,8 @@ function continueTest(evt) {
  var inlineSpellChecker = editor.getInlineSpellChecker(true);
  const is_en_US = SpecialPowers.Services.locale.appLocaleAsBCP47 == "en-US";

-  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  onSpellCheck(elem, async function() {
    var spellchecker = inlineSpellChecker.spellChecker;
--- a/editor/spellchecker/tests/test_nsIEditorSpellCheck_ReplaceWord.html
+++ b/editor/spellchecker/tests/test_nsIEditorSpellCheck_ReplaceWord.html
@ -12,8 +12,8 @@

 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(async () => {
-  const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  const editor = document.querySelector("div[contenteditable]");
  async function replaceWord(aMisspelledWord, aCorrectWord, aReplaceAll) {
--- a/editor/spellchecker/tests/test_spellcheck_after_edit.html
+++ b/editor/spellchecker/tests/test_spellcheck_after_edit.html
@ -8,8 +8,8 @@
 </head>
 <body>
 <script>
-let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 function waitForTick() {
--- a/editor/spellchecker/tests/test_spellcheck_after_pressing_navigation_key.html
+++ b/editor/spellchecker/tests/test_spellcheck_after_pressing_navigation_key.html
@ -13,8 +13,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1729653
 <body>
 <textarea rows="20" cols="50">That undfgdfg seems OK.</textarea>
 <script>
-let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );

 function waitForTick() {
--- a/editor/spellchecker/tests/test_spellcheck_selection.html
+++ b/editor/spellchecker/tests/test_spellcheck_selection.html
@ -10,8 +10,8 @@
 add_task(async function() {
  await new Promise(resolve => SimpleTest.waitForFocus(resolve));

-  let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );

  let editingHost = document.querySelector("div[contenteditable][lang=en-US]");
--- a/editor/spellchecker/tests/test_suggest.html
+++ b/editor/spellchecker/tests/test_suggest.html
@ -15,8 +15,8 @@
 add_task(async function() {
  await new Promise(resolve => SimpleTest.waitForFocus(resolve));

-  let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );

  let element = document.getElementById("en-US");
--- a/extensions/spellcheck/tests/chrome/test_add_remove_dictionaries.xhtml
+++ b/extensions/spellcheck/tests/chrome/test_add_remove_dictionaries.xhtml
@ -65,8 +65,8 @@ function RunTest() {
  ok(map.exists());
  hunspell.addDirectory(map);

-  const {maybeOnSpellCheck} = ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm");
+  const {maybeOnSpellCheck} = ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs");
    maybeOnSpellCheck(textbox, function () {

    // test that base and map dictionaries are available
--- a/extensions/spellcheck/tests/mochitest/test_bug1170484.html
+++ b/extensions/spellcheck/tests/mochitest/test_bug1170484.html
@ -14,8 +14,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1170484
  /** Test for Bug 1170484 */
  SimpleTest.waitForExplicitFinish();

-  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );

  SimpleTest.waitForFocus(doTest, window);
--- a/extensions/spellcheck/tests/mochitest/test_bug1272623.html
+++ b/extensions/spellcheck/tests/mochitest/test_bug1272623.html
@ -63,8 +63,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1272623
  }

  add_task(async function() {
-    maybeOnSpellCheck = SpecialPowers.ChromeUtils.import(
-      "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+    maybeOnSpellCheck = SpecialPowers.ChromeUtils.importESModule(
+      "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
    ).maybeOnSpellCheck;

    // Wait for the page to be ready
--- a/layout/base/tests/bug512295-1-ref.html
+++ b/layout/base/tests/bug512295-1-ref.html
@ -12,8 +12,8 @@ x
  var p = document.getElementById('p');
  var div = p.parentNode;
  div.focus();
-  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  maybeOnSpellCheck(div, function () {
    var sel = window.getSelection();
--- a/layout/base/tests/bug512295-1.html
+++ b/layout/base/tests/bug512295-1.html
@ -19,8 +19,8 @@ x
  sel.addRange(range);
  p.parentNode.focus();

-  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  maybeOnSpellCheck(p.parentNode, function () {
    sendKey('DOWN');  // now after "1"
--- a/layout/base/tests/bug512295-2-ref.html
+++ b/layout/base/tests/bug512295-2-ref.html
@ -12,8 +12,8 @@ x
  var p = document.getElementById('p');
  var div = p.parentNode;
  div.focus();
-  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  maybeOnSpellCheck(div, function () {
    var sel = window.getSelection();
--- a/layout/base/tests/bug512295-2.html
+++ b/layout/base/tests/bug512295-2.html
@ -19,8 +19,8 @@ x
  sel.addRange(range);
  p.parentNode.focus();

-  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
  );
  maybeOnSpellCheck(p.parentNode, function () {
    sendKey('DOWN');  // now after "1"
--- a/layout/base/tests/bug923376-ref.html
+++ b/layout/base/tests/bug923376-ref.html
@ -3,8 +3,8 @@
 <script src="/tests/SimpleTest/EventUtils.js"></script>
 <script>
 document.body.firstChild.focus();
-var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );
 maybeOnSpellCheck(document.body.firstChild, function() {
  document.documentElement.removeAttribute("class");
--- a/layout/base/tests/bug923376.html
+++ b/layout/base/tests/bug923376.html
@ -4,8 +4,8 @@
 <script>
 var div = document.body.firstChild;
 div.focus();
-var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"
 );
 maybeOnSpellCheck(div, function() {
  div.innerHTML = 'something missspelled<br>something elsed#';
--- a/toolkit/content/tests/chrome/test_mozinputbox_dictionary.xhtml
+++ b/toolkit/content/tests/chrome/test_mozinputbox_dictionary.xhtml
@ -44,8 +44,8 @@ function startTests()
  inputBox._input.focus();
  testNum = 0;

-  ({onSpellCheck} = ChromeUtils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"));
+  ({onSpellCheck} = ChromeUtils.importESModule(
+    "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs"));
  onSpellCheck(inputBox._input, function () {
    bringUpContextMenu(inputBox);
  });