Bug 1016184 - Part 3d: Fix test_bug644768.html. r=ehsan
authorTing-Yu Lin <tlin@mozilla.com>
Sun, 27 Jul 2014 00:18:00 +0200
changeset 197992 0964ceb05146ab359218022b45b5c5422bfa99c4
parent 197991 36b67964bdd05216339508e020463b3aafceb64d
child 197993 122020a322551c8a06a36f9d105ac2e71cbf00b0
push id27256
push userkwierso@gmail.com
push dateWed, 06 Aug 2014 00:06:20 +0000
treeherdermozilla-central@6cbdd4d523a7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs1016184, 644768
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1016184 - Part 3d: Fix test_bug644768.html. r=ehsan Rename test_bug644768.html to bug644768.html, and change the original test_bug644768.html to an iframe container. Thank Steven Lee <slee@mozilla.com> for the original WIP patch.
layout/base/tests/bug644768.html
layout/base/tests/mochitest.ini
layout/base/tests/test_bug644768.html
new file mode 100644
--- /dev/null
+++ b/layout/base/tests/bug644768.html
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=644768
+-->
+<head>
+  <title>Test for Bug 644768</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/WindowSnapshot.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body onload="test()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=644768">Mozilla Bug 644768</a>
+<p id="display"></p>
+<div id="content">
+<!-- test text is
+== زادروزها ==
+* [[۱۳۰۷]]
+-->
+ <textarea id="testInput" dir="rtl" cols="80" rows="25">
+
+== &#x0632;&#x0627;&#x062F;&#x0631;&#x0648;&#x0632;&#x0647;&#x0627; ==
+* [[&#x06F1;&#x06F3;&#x06F0;&#x06F7;]]</textarea>
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+/** Test for Bug 644768 **/
+
+SimpleTest.waitForExplicitFinish();
+
+function test() {
+  var textInput = $("testInput");
+  var s1, s2, equal, str1, str2;
+
+  textInput.focus();
+  s1 = snapshotWindow(window);
+
+  synthesizeKey("VK_UP", { });
+  synthesizeKey("VK_UP", { });
+  synthesizeKey("VK_UP", { });
+  synthesizeKey("VK_DELETE", { });
+  synthesizeKey("VK_RETURN", { });
+  // Bug 1016184: Touch caret will hide due to key event.
+  s2 = snapshotWindow(window);
+
+  [equal, str1, str2] = compareSnapshots(s1, s2, true);
+  ok(equal, "newline before bidi text shouldn't change direction: expected " +
+     str1 + " but got " + str2);
+
+  SimpleTest.finish();
+}
+
+</script>
+</pre>
+</body>
+</html>
--- a/layout/base/tests/mochitest.ini
+++ b/layout/base/tests/mochitest.ini
@@ -45,16 +45,17 @@ support-files =
   bug570378-persian-2.html
   bug570378-persian-2-ref.html
   bug570378-persian-3.html
   bug570378-persian-3-ref.html
   bug570378-persian-4.html
   bug570378-persian-4-ref.html
   bug570378-persian-5.html
   bug570378-persian-5-ref.html
+  bug644768.html
 
 [test_preserve3d_sorting_hit_testing.html]
 [test_after_paint_pref.html]
 [test_bug993936.html]
 skip-if = e10s
 [test_border_radius_hit_testing.html]
 [test_bug66619.html]
 [test_bug93077-1.html]
--- a/layout/base/tests/test_bug644768.html
+++ b/layout/base/tests/test_bug644768.html
@@ -1,58 +1,28 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=644768
--->
-<head>
-  <title>Test for Bug 644768</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/WindowSnapshot.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="test()">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=644768">Mozilla Bug 644768</a>
-<p id="display"></p>
-<div id="content">
-<!-- test text is 
-== زادروزها ==
-* [[۱۳۰۷]]
--->
- <textarea id="testInput" dir="rtl" cols="80" rows="25">
-
-== &#x0632;&#x0627;&#x062F;&#x0631;&#x0648;&#x0632;&#x0647;&#x0627; ==
-* [[&#x06F1;&#x06F3;&#x06F0;&#x06F7;]]</textarea>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-/** Test for Bug 644768 **/
-
-SimpleTest.waitForExplicitFinish();
-
-function test() {
-  var textInput = $("testInput");
-  var s1, s2, equal, str1, str2;
-
-  textInput.focus();
-  s1 = snapshotWindow(window);
-
-  synthesizeKey("VK_UP", { });
-  synthesizeKey("VK_UP", { });
-  synthesizeKey("VK_UP", { });
-  synthesizeKey("VK_DELETE", { });
-  synthesizeKey("VK_RETURN", { });
-  s2 = snapshotWindow(window);
-
-  [equal, str1, str2] = compareSnapshots(s1, s2, true);
-  ok(equal, "newline before bidi text shouldn't change direction: expected " +
-     str1 + " but got " + str2);
-
-  SimpleTest.finish();
-}
-
-</script>
-</pre>
-</body>
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Bug 644768 test</title>
+    <style>
+      iframe {
+        width: 600px;
+        height: 400px;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="container"></div>
+  </body>
+  <script>
+  // Touch caret's pref is checked only when PresShell is initialized. To turn
+  // off the pref, we test bug 644768 in an iframe.
+  SpecialPowers.pushPrefEnv({"set": [['touchcaret.enabled', false]]}, function() {
+    var iframe = document.createElement("iframe");
+    iframe.src = "bug644768.html";
+    document.getElementById('container').appendChild(iframe);
+  });
+  </script>
 </html>
-