From 11967f6b541ee3f0e86cbfebe7a277e612e05dea Mon Sep 17 00:00:00 2001
From: issammani <imani@mozilla.com>
Date: Wed, 24 Aug 2022 18:11:05 +0000
Subject: [PATCH] Bug 1778179 - Remove duplicate definitions of
 waitForNextPopup. r=sgalich

Differential Revision: https://phabricator.services.mozilla.com/D155251
---
 .../satchel/test/test_bug_511615.html         | 18 ++++-----------
 .../satchel/test/test_bug_787624.html         | 21 +++++------------
 .../test_history_datalist_duplicates.html     | 15 ++++--------
 .../test/test_password_autocomplete.html      | 23 +++++++------------
 4 files changed, 24 insertions(+), 53 deletions(-)

diff --git a/toolkit/components/satchel/test/test_bug_511615.html b/toolkit/components/satchel/test/test_bug_511615.html
index 0357d33b5cd3..036aa1029e00 100644
--- a/toolkit/components/satchel/test/test_bug_511615.html
+++ b/toolkit/components/satchel/test/test_bug_511615.html
@@ -22,13 +22,6 @@ Test for Form History Autocomplete Untrusted Events: Bug 511615
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
-var resolvePopupShownListener;
-registerPopupShownListener(() => resolvePopupShownListener());
-
-function waitForNextPopup() {
-  return new Promise(resolve => { resolvePopupShownListener = resolve; });
-}
-
 /**
  * Indicates the time to wait before checking that the state of the autocomplete
  * popup, including whether it is open, has not changed in response to events.
@@ -53,7 +46,7 @@ SimpleTest.requestFlakyTimeout("Must ensure that an event does not happen.");
  * @returns {Promise}
  */
 function expectPopupDoesNotOpen(triggerFn) {
-  let popupShown = waitForNextPopup();
+  const popupShown = promiseACShown();
   triggerFn();
   return Promise.race([
     popupShown.then(() => Promise.reject("Popup opened unexpectedly.")),
@@ -172,9 +165,9 @@ add_task(async function test_untrusted_events_ignored() {
   }
 
   // A privileged key press will actually open the popup.
-  let popupShown = waitForNextPopup();
+  const promisePopupShown = promiseACShown();
   synthesizeKey("KEY_ArrowDown");
-  await popupShown;
+  await promisePopupShown;
 
   // The selected autocomplete item should not change from untrusted events.
   for (let triggerFn of [
@@ -186,7 +179,7 @@ add_task(async function test_untrusted_events_ignored() {
   }
 
   // A privileged key press will actually change the selected index.
-  let indexChanged = new Promise(resolve => notifySelectedIndex(0, resolve));
+  const indexChanged = new Promise(resolve => notifySelectedIndex(0, resolve));
   synthesizeKey("KEY_ArrowDown");
   await indexChanged;
 
@@ -205,9 +198,8 @@ add_task(async function test_untrusted_events_ignored() {
     await checkSelectedIndexAfterResponseTime(0);
     is(input.value, "", "The selected item should not have been used.");
   }
+  input.blur(); // Close popup
 
-  // Close the popup.
-  input.blur();
 });
 </script>
 </pre>
diff --git a/toolkit/components/satchel/test/test_bug_787624.html b/toolkit/components/satchel/test/test_bug_787624.html
index a10491b673c9..22f4ce610e38 100644
--- a/toolkit/components/satchel/test/test_bug_787624.html
+++ b/toolkit/components/satchel/test/test_bug_787624.html
@@ -50,15 +50,6 @@ Form History Layout test: form field autocomplete: Bug 787624
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
-/** Test for Form History autocomplete Layout: Bug 787624 **/
-
-var resolvePopupShownListener;
-registerPopupShownListener(() => resolvePopupShownListener());
-
-function waitForNextPopup() {
-  return new Promise(resolve => { resolvePopupShownListener = resolve; });
-}
-
 add_setup(async () => {
   await updateFormHistory([
     { op: "remove" },
@@ -68,15 +59,15 @@ add_setup(async () => {
 });
 
 add_task(async function test_popup_not_move_input() {
-  let input = getFormElementByName(1, "field1");
-  let rect = input.getBoundingClientRect();
+  const input = getFormElementByName(1, "field1");
+  const rect = input.getBoundingClientRect();
 
-  let popupShown = waitForNextPopup();
   input.focus();
-  synthesizeKey("KEY_ArrowDown", {});
-  await popupShown;
+  const promisePopupShown = promiseACShown();
+  synthesizeKey("KEY_ArrowDown");
+  await promisePopupShown;
 
-  let newRect = input.getBoundingClientRect();
+  const newRect = input.getBoundingClientRect();
   is(newRect.left, rect.left,
      "autocomplete popup does not disturb the input position");
   is(newRect.top, rect.top,
diff --git a/toolkit/components/satchel/test/test_history_datalist_duplicates.html b/toolkit/components/satchel/test/test_history_datalist_duplicates.html
index 8ffe534c0afd..a4641ad6a274 100644
--- a/toolkit/components/satchel/test/test_history_datalist_duplicates.html
+++ b/toolkit/components/satchel/test/test_history_datalist_duplicates.html
@@ -27,13 +27,6 @@
 <script class="testbody" type="text/javascript">
 const input = document.getElementById("field1");
 
-let resolvePopupShownListener;
-registerPopupShownListener(() => resolvePopupShownListener());
-
-function waitForNextPopup() {
-  return new Promise(resolve => { resolvePopupShownListener = resolve; });
-}
-
 add_setup(async () => {
   await new Promise(resolve => updateFormHistory([
     { op: "add", fieldname: "field1", value: "Mozilla" },
@@ -61,10 +54,12 @@ add_task(async function test_non_duplicate_entries_are_shown_once() {
 async function triggerAutofillAndCheckEntriesValue(inputValue, expectedValues) {
   SpecialPowers.wrap(input).setUserInput(inputValue);
   input.focus();
-  synthesizeKey("KEY_ArrowDown"); // trigger autocomplete dropdown
-  await waitForNextPopup();
+  const promisePopupShown = promiseACShown();
+  synthesizeKey("KEY_ArrowDown");
+  await promisePopupShown;
   isDeeply(getMenuEntries(), expectedValues, "Matching deduplicated autocomplete list entries with expected values.");
-  input.blur();
+  input.blur(); // Close popup
+
 }
 
 </script>
diff --git a/toolkit/components/satchel/test/test_password_autocomplete.html b/toolkit/components/satchel/test/test_password_autocomplete.html
index 9e8792f8039a..39d19890504f 100644
--- a/toolkit/components/satchel/test/test_password_autocomplete.html
+++ b/toolkit/components/satchel/test/test_password_autocomplete.html
@@ -34,13 +34,6 @@
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
-var resolvePopupShownListener;
-registerPopupShownListener(() => resolvePopupShownListener());
-
-function waitForNextPopup() {
-  return new Promise(resolve => { resolvePopupShownListener = resolve; });
-}
-
 /**
  * Indicates the time to wait before checking that the state of the autocomplete
  * popup, including whether it is open, has not changed in response to events.
@@ -65,7 +58,7 @@ SimpleTest.requestFlakyTimeout("Must ensure that an event does not happen.");
  * @returns {Promise}
  */
 function expectPopupDoesNotOpen(triggerFn) {
-  let popupShown = waitForNextPopup();
+  const popupShown = promiseACShown();
   triggerFn();
   return Promise.race([
     popupShown.then(() => Promise.reject("Popup opened unexpectedly.")),
@@ -97,7 +90,7 @@ add_setup(async () => {
 });
 
 add_task(async function test_secure_noFormHistoryOrWarning() {
-  let input = getFormElementByName(1, "field1");
+  const input = getFormElementByName(1, "field1");
 
   // The autocomplete popup should not open under any circumstances on
   // type=password with password manager disabled.
@@ -116,22 +109,22 @@ add_task(async function test_secure_noFormHistoryOrWarning() {
     await expectPopupDoesNotOpen(triggerFn);
   }
 
-  // Close the popup.
   input.blur();
 });
 
 add_task(async function test_insecure_focusWarning() {
   // Form 2 has an insecure action so should show the warning even if password manager is disabled.
-  let input = getFormElementByName(2, "field1");
-  let shownPromise = waitForNextPopup();
+  const input = getFormElementByName(2, "field1");
+
   input.focus();
-  await shownPromise;
+  const promisePopupShown = promiseACShown();
+  synthesizeKey("KEY_ArrowDown");
+  await promisePopupShown;
 
   ok(getMenuEntries()[0].includes("Logins entered here could be compromised"),
      "Check warning is first");
 
-  // Close the popup
-  input.blur();
+  input.blur(); // Close popup.
 });
 </script>
 </pre>