Bug 1269209 - Port test_bug1154791.html from chrome to plain; r?masayuki
MozReview-Commit-ID: 8MmrfEJXFb9
--- a/editor/libeditor/tests/chrome.ini
+++ b/editor/libeditor/tests/chrome.ini
@@ -15,17 +15,16 @@ skip-if = buildapp == 'mulet'
[test_bug646194.xul]
[test_bug780908.xul]
[test_bug1102906.html]
[test_bug1101392.html]
subsuite = clipboard
[test_bug1140617.xul]
subsuite = clipboard
[test_bug1153237.html]
-[test_bug1154791.html]
[test_bug1248128.html]
[test_bug1248185.html]
[test_bug1250010.html]
[test_bug1257363.html]
[test_composition_event_created_in_chrome.html]
[test_contenteditable_text_input_handling.html]
[test_dragdrop.html]
skip-if = buildapp == 'mulet'
--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@@ -168,16 +168,17 @@ skip-if = os != "win"
skip-if = os != "win"
[test_bug998188.html]
[test_bug1026397.html]
[test_bug1053048.html]
[test_bug1067255.html]
[test_bug1094000.html]
[test_bug1100966.html]
[test_bug1140105.html]
+[test_bug1154791.html]
[test_CF_HTML_clipboard.html]
subsuite = clipboard
[test_contenteditable_focus.html]
[test_dom_input_event_on_htmleditor.html]
skip-if = toolkit == 'android' # bug 1054087
[test_dom_input_event_on_texteditor.html]
[test_keypress_untrusted_event.html]
[test_root_element_replacement.html]
--- a/editor/libeditor/tests/test_bug1154791.html
+++ b/editor/libeditor/tests/test_bug1154791.html
@@ -1,18 +1,18 @@
<!DOCTYPE>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1154791
-->
<head>
<title>Test for Bug 1154791</title>
- <script type="application/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 type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
+ <script src="/tests/SimpleTest/SimpleTest.js"></script>
+ <link rel="stylesheet" href="/tests/SimpleTest/test.css">
+ <script src="/tests/SimpleTest/EventUtils.js"></script>
</head>
<body>
<div id="display">
</div>
<div id="content" contenteditable>
<tt>thiss onee is stilll a</tt>
</div>
@@ -45,18 +45,19 @@ SimpleTest.waitForFocus(function() {
SimpleTest.finish();
},0);
},0);
},0);
});
function getSpellCheckSelection() {
- var Ci = Components.interfaces;
- var editingSession = window.QueryInterface(Ci.nsIInterfaceRequestor)
+ 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;
return selcon.getSelection(selcon.SELECTION_SPELLCHECK);
}
