Backed out 3 changesets (bug 1351074) for reftest harness and browser_all_files_referenced.js bustage

CLOSED TREE

Backed out changeset 941e0f9ff9a7 (bug 1351074)
Backed out changeset 4fdf3b87a70b (bug 1351074)
Backed out changeset 586428f69838 (bug 1351074)

browser/base/content/test/general/contextmenu_common.js

@@ -17,9 +17,7 @@ function openContextMenuFor(element, shiftkey, waitForSpellCheck) {
     }
 
     if (waitForSpellCheck) {
-      var { onSpellCheck } =
-        SpecialPowers.Cu.import(
-          "resource://testing-common/AsyncSpellCheckTestHelper.jsm", {});
+      var { onSpellCheck } = SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", {});
       onSpellCheck(element, actuallyOpenContextMenuFor);
     } else {
       actuallyOpenContextMenuFor();
@@ -280,9 +278,7 @@ function* test_contextmenu(selector, menuItems, options = {}) {
   if (options.waitForSpellCheck) {
     info("Waiting for spell check");
     yield ContentTask.spawn(gBrowser.selectedBrowser, selector, function*(contentSelector) {
-      let {onSpellCheck} =
-        Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm",
-                  {});
+      let {onSpellCheck} = Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", {});
       let element = content.document.querySelector(contentSelector);
       yield new Promise(resolve => onSpellCheck(element, resolve));
       info("Spell check running");

editor/composer/test/test_async_UpdateCurrentDictionary.html

@@ -24,8 +24,7 @@ function start() {
   var textarea = document.getElementById("editor");
   textarea.focus();
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")
   .onSpellCheck(textarea, function () {
     var isc = SpecialPowers.wrap(textarea).editor.getInlineSpellChecker(false);
     ok(isc, "Inline spell checker should exist after focus and spell check");

editor/composer/test/test_bug1200533.html

@@ -101,8 +101,7 @@ function continueTest(evt) {
   editor.setSpellcheckUserOverride(true);
   var inlineSpellChecker = editor.getInlineSpellChecker(true);
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")
   .onSpellCheck(elem, function () {
     var spellchecker = inlineSpellChecker.spellChecker;
     try {

editor/composer/test/test_bug1204147.html

@@ -67,8 +67,7 @@ var loadListener = function(evt) {
   editor.setSpellcheckUserOverride(true);
   var inlineSpellChecker = editor.getInlineSpellChecker(true);
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")
   .onSpellCheck(elem, function () {
     var spellchecker = inlineSpellChecker.spellChecker;
     try {

editor/composer/test/test_bug1205983.html

@@ -29,8 +29,8 @@ var selcon_de;
 var script;
 
 var onSpellCheck =
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm").onSpellCheck;
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")
+               .onSpellCheck;
 
 /** Test for Bug 1205983 **/
 SimpleTest.waitForExplicitFinish();

editor/composer/test/test_bug1209414.html

@@ -37,8 +37,8 @@ var script;
  */
 
 var onSpellCheck =
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm").onSpellCheck;
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")
+               .onSpellCheck;
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(function() {

editor/composer/test/test_bug1219928.html

@@ -29,8 +29,8 @@ var spellchecker;
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(function() {
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm", window);
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm",
+                          window);
 
   var elem = document.getElementById('en-US');
   elem.focus();

editor/composer/test/test_bug338427.html

@@ -21,8 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=338427
 /** Test for Bug 338427 **/
 function init() {
     var onSpellCheck =
-      SpecialPowers.Cu.import(
-        "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
+      SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")
                    .onSpellCheck;
     var textarea = document.getElementById("editor");
     var editor = SpecialPowers.wrap(textarea).editor;

editor/composer/test/test_bug678842.html

@@ -60,8 +60,7 @@ var loadListener = function(evt) {
   editor.setSpellcheckUserOverride(true);
   var inlineSpellChecker = editor.getInlineSpellChecker(true);
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")
   .onSpellCheck(elem, function () {
     var spellchecker = inlineSpellChecker.spellChecker;
     try {

editor/composer/test/test_bug697981.html

@@ -28,8 +28,7 @@ var editor_de;
 var script;
 
 var onSpellCheck =
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")
                .onSpellCheck;
 
 /** Test for Bug 697981 **/

editor/composer/test/test_bug717433.html

@@ -62,8 +62,7 @@ var loadListener = function(evt) {
   editor.setSpellcheckUserOverride(true);
   var inlineSpellChecker = editor.getInlineSpellChecker(true);
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")
   .onSpellCheck(elem, function () {
     var spellchecker = inlineSpellChecker.spellChecker;
     try {

editor/libeditor/tests/test_bug366682.html

@@ -49,8 +49,7 @@ function runTest() {
   gMisspeltWords = ["errror", "errror"];
   editDoc().designMode = "on";
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")
                .onSpellCheck(editDoc().documentElement, evalTest);
 }
 

editor/libeditor/tests/test_bug484181.html

@@ -53,8 +53,7 @@ function runTest() {
   var edit = document.getElementById("edit");
   edit.focus();
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm", window);
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", window);
   onSpellCheck(edit, function () {
     ok(isSpellingCheckOk(getEditor(), gMisspeltWords),
        "All misspellings before editing are accounted for.");

editor/libeditor/tests/test_bug596333.html

@@ -112,8 +112,7 @@ function runTest()
   var edit = document.getElementById("edit");
   edit.focus();
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm", window);
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", window);
   onSpellCheck(edit, runOnFocus);
 }
 </script>

editor/libeditor/tests/test_bug636465.html

@@ -11,8 +11,8 @@
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm", window);
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm",
+                          window);
   var x = document.getElementById("x");
   x.focus();
   onSpellCheck(x, function () {

editor/moz.build

@@ -38,7 +38,7 @@ EXPORTS += [
     'nsEditorCID.h',
 ]
 
-TESTING_JS_MODULES += [
+EXTRA_JS_MODULES += [
     'AsyncSpellCheckTestHelper.jsm',
 ]
 

extensions/spellcheck/tests/chrome/test_add_remove_dictionaries.xul

@@ -67,8 +67,7 @@ function RunTest() {
   ok(map.exists());
   hunspell.addDirectory(map);
 
-  Components.utils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm");
+  Components.utils.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm");
   onSpellCheck(textbox, function () {
 
     // test that base and map dictionaries are available

extensions/spellcheck/tests/mochitest/test_bug1170484.html

@@ -13,8 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1170484
 
   /** Test for Bug 1170484 **/
   SimpleTest.waitForExplicitFinish();
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm", window);
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", window);
 
   SimpleTest.waitForFocus(doTest, window);
   function doTest() {

extensions/spellcheck/tests/mochitest/test_bug1272623.html

@@ -54,8 +54,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1272623
   }
 
   add_task(function* () {
-    SpecialPowers.Cu.import(
-      "resource://testing-common/AsyncSpellCheckTestHelper.jsm", window);
+    SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", window);
 
     // Wait for the page to be ready
     yield new Promise(resolve => SimpleTest.waitForFocus(() => SimpleTest.executeSoon(resolve), window));

layout/base/tests/bug512295-1-ref.html

@@ -12,8 +12,7 @@ x
   var p = document.getElementById('p');
   var div = p.parentNode;
   div.focus();
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm", window);
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", window);
   onSpellCheck(div, function () {
     var sel = window.getSelection();
     sel.removeAllRanges();

layout/base/tests/bug512295-1.html

@@ -19,8 +19,7 @@ x
   sel.addRange(range);
   p.parentNode.focus();
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm", window);
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", window);
   onSpellCheck(p.parentNode, function () {
     sendKey('DOWN');  // now after "1"
     sendKey('DOWN');  // now make sure we get to the end

layout/base/tests/bug512295-2-ref.html

@@ -12,8 +12,7 @@ x
   var p = document.getElementById('p');
   var div = p.parentNode;
   div.focus();
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm", window);
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", window);
   onSpellCheck(div, function () {
     var sel = window.getSelection();
     sel.removeAllRanges();

layout/base/tests/bug512295-2.html

@@ -19,8 +19,7 @@ x
   sel.addRange(range);
   p.parentNode.focus();
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm", window);
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", window);
   onSpellCheck(p.parentNode, function () {
     sendKey('DOWN');  // now after "1"
     sendKey('DOWN');  // now below the P element

layout/base/tests/bug923376-ref.html

@@ -3,8 +3,8 @@
 <script src="/tests/SimpleTest/EventUtils.js"></script>
 <script>
 document.body.firstChild.focus();
-SpecialPowers.Cu.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm", window);
+SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm",
+                        window);
 onSpellCheck(document.body.firstChild, function() {
   document.documentElement.removeAttribute("class");
 });

layout/base/tests/bug923376.html

@@ -4,8 +4,8 @@
 <script>
 var div = document.body.firstChild;
 div.focus();
-SpecialPowers.Cu.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm", window);
+SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm",
+                        window);
 onSpellCheck(div, function() {
   div.innerHTML = 'something missspelled<br>something elsed#';
   onSpellCheck(div, function() {

layout/tools/reftest/jar.mn

@@ -1,7 +1,6 @@
 reftest.jar:
 % content reftest %content/
   content/reftest-content.js (reftest-content.js)
-  content/AsyncSpellCheckTestHelper.jsm (../../../editor/AsyncSpellCheckTestHelper.jsm)
   content/httpd.jsm (../../../netwerk/test/httpserver/httpd.js)
   content/StructuredLog.jsm (../../../testing/modules/StructuredLog.jsm)
 *  content/reftest.jsm (reftest.jsm)

layout/tools/reftest/reftest-content.js

@@ -21,7 +21,7 @@ const NS_GFXINFO_CONTRACTID = "@mozilla.org/gfx/info;1";
 const BLANK_URL_FOR_CLEARING = "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2D%2D%3E";
 
 CU.import("resource://gre/modules/Timer.jsm");
-CU.import("resource://reftest/content/AsyncSpellCheckTestHelper.jsm");
+CU.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm");
 
 var gBrowserIsRemote;
 var gIsWebRenderEnabled;

toolkit/content/tests/chrome/test_textbox_dictionary.xul

@@ -40,8 +40,7 @@ function startTests()
   textbox.focus();
   testNum = 0;
   
-  Components.utils.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm");
+  Components.utils.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm");
   onSpellCheck(textbox, function () {
     bringUpContextMenu(textbox);
   });