Bug 1261306 - convert test_autocomplete_change_after_focus.html from m-chrome to m-plain. r=dolske
☠☠ backed out by 4ac3b4265ce2 ☠ ☠
authorMike de Boer <mdeboer@mozilla.com>
Thu, 21 Apr 2016 11:53:53 +0200
changeset 317870 9ad67a907cae9644493ecbabae4529602ca3fa72
parent 317869 387167675e152537dd5538a61d07c155a4fabdd0
child 317871 a850056f05279162055f782757d4577df9ca8b85
push id9480
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 17:12:58 +0000
treeherdermozilla-aurora@0d6a91c76a9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdolske
bugs1261306
milestone48.0a1
Bug 1261306 - convert test_autocomplete_change_after_focus.html from m-chrome to m-plain. r=dolske
toolkit/content/tests/chrome/chrome.ini
toolkit/content/tests/chrome/test_autocomplete_change_after_focus.html
toolkit/content/tests/mochitest/mochitest.ini
toolkit/content/tests/mochitest/test_autocomplete_change_after_focus.html
--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@@ -49,17 +49,16 @@ support-files =
   rtltest/content/dirtest.xul
 
 [test_about_networking.html]
 [test_arrowpanel.xul]
 [test_autocomplete2.xul]
 [test_autocomplete3.xul]
 [test_autocomplete4.xul]
 [test_autocomplete5.xul]
-[test_autocomplete_change_after_focus.html]
 [test_autocomplete_delayOnPaste.xul]
 [test_autocomplete_emphasis.xul]
 [test_autocomplete_with_composition_on_input.html]
 [test_autocomplete_with_composition_on_textbox.xul]
 [test_autocomplete_placehold_last_complete.xul]
 [test_browser_drop.xul]
 skip-if = buildapp == 'mulet'
 [test_bug253481.xul]
--- a/toolkit/content/tests/mochitest/mochitest.ini
+++ b/toolkit/content/tests/mochitest/mochitest.ini
@@ -1,3 +1,4 @@
+[test_autocomplete_change_after_focus.html]
 [test_mousecapture.xhtml]
 skip-if = toolkit == "android"
 
rename from toolkit/content/tests/chrome/test_autocomplete_change_after_focus.html
rename to toolkit/content/tests/mochitest/test_autocomplete_change_after_focus.html
--- a/toolkit/content/tests/chrome/test_autocomplete_change_after_focus.html
+++ b/toolkit/content/tests/mochitest/test_autocomplete_change_after_focus.html
@@ -1,67 +1,103 @@
 <!DOCTYPE html>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=998893
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 998893 - Ensure that input.value changes affect autocomplete</title>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://global/skin"/>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-  <script type="application/javascript">
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="text/javascript">
   /** Test for Bug 998893 **/
-  SimpleTest.waitForExplicitFinish();
-  SimpleTest.waitForFocus(setup);
+  add_task(function* waitForFocus() {
+    yield new Promise(resolve => SimpleTest.waitForFocus(resolve));
+  });
 
-  function setup() {
-    SpecialPowers.formHistory.update([
-      { op : "bump", fieldname: "field1", value: "Default text option" },
-      { op : "bump", fieldname: "field1", value: "New value option" },
-    ], {
-      handleCompletion: function() {
-        runTest();
-      },
-    });
-  }
+  add_task(function* setup() {
+    yield new Promise(resolve => {
+      let chromeScript = SpecialPowers.loadChromeScript(function() {
+        const {FormHistory} = Components.utils.import("resource://gre/modules/FormHistory.jsm", null);
+        FormHistory.update([
+          { op : "bump", fieldname: "field1", value: "Default text option" },
+          { op : "bump", fieldname: "field1", value: "New value option" },
+        ], {
+          handleCompletion: function() {
+            sendAsyncMessage("Test:Resume");
+          },
+        });
+      });
 
-  function handleEnter(evt) {
-    if (evt.keyCode != KeyEvent.DOM_VK_RETURN) {
-      return;
-    }
-    info("RETURN received for phase: " + evt.eventPhase);
-    is(evt.target.value, "New value option", "Check that the correct autocomplete entry was used");
-    SimpleTest.finish();
-  }
+      chromeScript.addMessageListener("Test:Resume", function resumeListener() {
+        chromeScript.removeMessageListener("Test:Resume", resumeListener);
+        chromeScript.destroy();
+        resolve();
+      });
+    });
+  });
 
-  function popupShownListener(evt) {
-    info("popupshown");
-    sendKey("DOWN");
-    sendKey("RETURN"); // select the first entry in the popup
-    sendKey("RETURN"); // try to submit the form with the filled value
-  }
+  add_task(function* runTest() {
+    let promisePopupShown = new Promise(resolve => {
+      let chromeScript = SpecialPowers.loadChromeScript(function() {
+        Components.utils.import("resource://gre/modules/Services.jsm");
+        let window = Services.wm.getMostRecentWindow("navigator:browser");
+        let popup = window.document.getElementById("PopupAutoComplete");
+        popup.addEventListener("popupshown", function popupShown() {
+          popup.removeEventListener("popupshown", popupShown);
+          sendAsyncMessage("Test:Resume");
+        });
+      });
 
-  SpecialPowers.addAutoCompletePopupEventListener(window, "popupshown", popupShownListener);
-
-  function runTest() {
-    var field = document.getElementById("field1");
-    field.addEventListener("focus", function onFocus() {
-      info("field focused");
-      field.value = "New value";
-      sendKey("DOWN");
+      chromeScript.addMessageListener("Test:Resume", function resumeListener() {
+        chromeScript.removeMessageListener("Test:Resume", resumeListener);
+        chromeScript.destroy();
+        resolve();
+      });
     });
 
-    field.addEventListener("keypress", handleEnter, true);
+    let field = document.getElementById("field1");
+
+    let promiseFieldFocus = new Promise(resolve => {
+      field.addEventListener("focus", function onFocus() {
+        info("field focused");
+        field.value = "New value";
+        sendKey("DOWN");
+        resolve();
+      });
+    });
+
+    let handleEnterPromise = new Promise(resolve => {
+      function handleEnter(evt) {
+        if (evt.keyCode != KeyEvent.DOM_VK_RETURN) {
+          return;
+        }
+        info("RETURN received for phase: " + evt.eventPhase);
+        is(evt.target.value, "New value option", "Check that the correct autocomplete entry was used");
+        resolve();
+      }
+
+      field.addEventListener("keypress", handleEnter, true);
+    });
 
     field.focus();
-  }
+
+    yield promiseFieldFocus;
+
+    yield promisePopupShown;
 
+    sendKey("DOWN");
+    sendKey("RETURN");
+    sendKey("RETURN");
+
+    yield handleEnterPromise;
+  });
   </script>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=998893">Mozilla Bug 998893</a>
 <p id="display"><input id="field1" value="Default text"></p>
 <div id="content" style="display: none"></div>
 <pre id="test">
 </pre>