Bug 1271120 - Port test_bug1219928.html from chrome to plain; r?masayuki draft
authorAryeh Gregor <ayg@aryeh.name>
Thu, 01 Sep 2016 17:15:28 +0300
changeset 430252 a0f6d1ab307599bb8b413de2a15a6cdcbb6bf43f
parent 430251 22f610e98d27492446b710feafe44fc24bdb9172
child 535169 9715780defb75407e753221dbb9ed5211a60feef
push id33786
push userayg@aryeh.name
push dateThu, 27 Oct 2016 12:00:23 +0000
reviewersmasayuki
bugs1271120, 1219928, 1269209
milestone52.0a1
Bug 1271120 - Port test_bug1219928.html from chrome to plain; r?masayuki This test still doesn't work in e10s, though. mrbkap says further debugging is needed (bug 1269209 comment 3). MozReview-Commit-ID: 3iHNkQVYQMn
editor/composer/test/chrome.ini
editor/composer/test/mochitest.ini
editor/composer/test/test_bug1219928.html
--- a/editor/composer/test/chrome.ini
+++ b/editor/composer/test/chrome.ini
@@ -5,10 +5,9 @@ skip-if = buildapp == 'b2g' || os == 'an
 [test_bug338427.html]
 [test_bug434998.xul]
 [test_bug678842.html]
 [test_bug697981.html]
 [test_bug717433.html]
 [test_bug1204147.html]
 [test_bug1200533.html]
 [test_bug1205983.html]
-[test_bug1219928.html]
 [test_bug1266815.html]
--- a/editor/composer/test/mochitest.ini
+++ b/editor/composer/test/mochitest.ini
@@ -15,8 +15,10 @@ support-files =
 
 [test_bug348497.html]
 [test_bug384147.html]
 [test_bug389350.html]
 skip-if = toolkit == 'android'
 [test_bug519928.html]
 [test_bug738440.html]
 [test_bug1209414.html]
+[test_bug1219928.html]
+skip-if = e10s
--- a/editor/composer/test/test_bug1219928.html
+++ b/editor/composer/test/test_bug1219928.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=1219928
 -->
 <head>
   <title>Test for Bug 1219928</title>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1219928">Mozilla Bug 1219928</a>
 <p id="display"></p>
 
 <div contenteditable id="en-US" lang="en-US">
 <p>And here a missspelled word</p>
 <style>
@@ -24,36 +24,40 @@ https://bugzilla.mozilla.org/show_bug.cg
 
 /** Test for Bug 1219928 **/
 /* Very simple test to check that <style> blocks are skipped in the spell check */
 
 var spellchecker;
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(function() {
-  Components.utils.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm");
+  SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm",
+                          window);
 
   var elem = document.getElementById('en-US');
   elem.focus();
 
   onSpellCheck(elem, function () {
-    var Ci = Components.interfaces;
-    var editingSession = window.QueryInterface(Ci.nsIInterfaceRequestor)
-                               .getInterface(Ci.nsIWebNavigation)
-                               .QueryInterface(Ci.nsIInterfaceRequestor)
-                               .getInterface(Ci.nsIEditingSession);
+    var Ci = SpecialPowers.Ci;
+    var editingSession = SpecialPowers.wrap(window)
+                                      .QueryInterface(Ci.nsIInterfaceRequestor)
+                                      .getInterface(Ci.nsIWebNavigation)
+                                      .QueryInterface(Ci.nsIInterfaceRequestor)
+                                      .getInterface(Ci.nsIEditingSession);
     var editor = editingSession.getEditorForWindow(window);
     var selcon = editor.selectionController;
     var sel = selcon.getSelection(selcon.SELECTION_SPELLCHECK);
 
     is(sel.toString(), "missspelled", "one misspelled word expected: missspelled");
 
-    spellchecker = Components.classes['@mozilla.org/editor/editorspellchecker;1'].createInstance(Components.interfaces.nsIEditorSpellCheck);
+    spellchecker = SpecialPowers.Cc['@mozilla.org/editor/editorspellchecker;1']
+                                .createInstance(Ci.nsIEditorSpellCheck);
     var filterContractId = "@mozilla.org/editor/txtsrvfilter;1";
-    spellchecker.setFilter(Components.classes[filterContractId].createInstance(Components.interfaces.nsITextServicesFilter));
+    spellchecker.setFilter(SpecialPowers.Cc[filterContractId]
+                                        .createInstance(Ci.nsITextServicesFilter));
     spellchecker.InitSpellChecker(editor, false, spellCheckStarted);
   });
 });
 
 function spellCheckStarted() {
   var misspelledWord = spellchecker.GetNextMisspelledWord();
   is(misspelledWord, "missspelled", "first misspelled word expected: missspelled");