Backed out changeset cea0421beffa (bug 1269209)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 28 Oct 2016 00:38:17 +0200
changeset 319771 426fb19f0b82817f28d74a5063024d6f95fdc116
parent 319770 d1e5c08797c27957d7107cfc0a988d3822851d48
child 319772 53bb4e1916307ea601a13cee5fb946ad24095abb
push id20748
push userphilringnalda@gmail.com
push dateFri, 28 Oct 2016 03:39:55 +0000
treeherderfx-team@715360440695 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1269209
milestone52.0a1
backs outcea0421beffa3dde557dfd1edc1a780e7a0fbd92
Backed out changeset cea0421beffa (bug 1269209) MozReview-Commit-ID: K2h53eVFx72
editor/libeditor/tests/chrome.ini
editor/libeditor/tests/mochitest.ini
editor/libeditor/tests/test_bug46555.html
--- a/editor/libeditor/tests/chrome.ini
+++ b/editor/libeditor/tests/chrome.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g' || os == 'android'
 support-files = green.png
 
+[test_bug46555.html]
 [test_bug366682.html]
 support-files = spellcheck.js
 [test_bug471319.html]
 [test_bug483651.html]
 [test_bug489202.xul]
 [test_bug490879.xul]
 subsuite = clipboard
 [test_bug569988.html]
--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@@ -9,17 +9,16 @@ support-files =
   file_bug549262.html
   file_bug586662.html
   file_bug674770-1.html
   file_bug915962.html
   file_select_all_without_body.html
   green.png
   spellcheck.js
 
-[test_bug46555.html]
 [test_bug200416.html]
 [test_bug289384.html]
 skip-if = os != "mac"
 [test_bug290026.html]
 [test_bug291780.html]
 [test_bug309731.html]
 [test_bug316447.html]
 [test_bug318065.html]
--- a/editor/libeditor/tests/test_bug46555.html
+++ b/editor/libeditor/tests/test_bug46555.html
@@ -4,18 +4,19 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=46555
 -->
 
 <head>
   <title>Test for Bug 46555</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" href="/tests/SimpleTest/test.css">
+  <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"/>
 </head>
 
 <body>
   <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=46555">Mozilla Bug 46555</a>
   <p id="display"></p>
   <div id="content" style="display: none">
   </div>
 
@@ -26,18 +27,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 
       /** Test for Bug 46555 **/
       SimpleTest.waitForExplicitFinish();
       SimpleTest.waitForFocus(function() {
         const kCmd = "cmd_selectAll";
 
         var input = document.getElementById("t1");
         input.focus();
-        var controller =
-          SpecialPowers.wrap(input).controllers.getControllerForCommand(kCmd);
+        var controller = input.controllers.getControllerForCommand(kCmd);
 
         // Test 1: Select All should be disabled if editor is empty
         is(controller.isCommandEnabled(kCmd), false,
            "Select All command disabled when editor is empty");
 
         SimpleTest.finish();
       });
    </script>