Commit cd8761e0 authored by Makoto Kato's avatar Makoto Kato
Browse files

Bug 1351074 - Part 2. Use testing-common for AsyncSpellCheckTestHelper.jsm. r=masayuki 

TESTING_JS_MODULES uses testing-common, not gre.  So we should replace gre with testing-common for mochitest.

MozReview-Commit-ID: BqsS2D3IGR6

--HG--
extra : rebase_source : 2143fcdf33c428c82c6b2e00b542649b958aeccc
parent 8426259e

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

+6 −2
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ function openContextMenuFor(element, shiftkey, waitForSpellCheck) { 
    }



    if (waitForSpellCheck) {

      var { onSpellCheck } = SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", {});

      var { onSpellCheck } =

        SpecialPowers.Cu.import(

          "resource://testing-common/AsyncSpellCheckTestHelper.jsm", {});

      onSpellCheck(element, actuallyOpenContextMenuFor);

    } else {

      actuallyOpenContextMenuFor();
@@ -278,7 +280,9 @@ 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://gre/modules/AsyncSpellCheckTestHelper.jsm", {});

      let {onSpellCheck} =

        Cu.import("resource://testing-common/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

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ function start() { 
  var textarea = document.getElementById("editor");

  textarea.focus();



  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")

  SpecialPowers.Cu.import(

    "resource://testing-common/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

+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ function continueTest(evt) { 
  editor.setSpellcheckUserOverride(true);

  var inlineSpellChecker = editor.getInlineSpellChecker(true);



  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")

  SpecialPowers.Cu.import(

    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")

  .onSpellCheck(elem, function () {

    var spellchecker = inlineSpellChecker.spellChecker;

    try {

editor/composer/test/test_bug1204147.html

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ var loadListener = function(evt) { 
  editor.setSpellcheckUserOverride(true);

  var inlineSpellChecker = editor.getInlineSpellChecker(true);



  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")

  SpecialPowers.Cu.import(

    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")

  .onSpellCheck(elem, function () {

    var spellchecker = inlineSpellChecker.spellChecker;

    try {

editor/composer/test/test_bug1205983.html

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ var selcon_de; 
var script;



var onSpellCheck =

  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm")

               .onSpellCheck;

  SpecialPowers.Cu.import(

    "resource://testing-common/AsyncSpellCheckTestHelper.jsm").onSpellCheck;



/** Test for Bug 1205983 **/

SimpleTest.waitForExplicitFinish();