1 files changed, 13 insertions, 16 deletions
diff --git a/browser/extensions/formautofill/test/browser/browser_autocomplete_footer.js b/browser/extensions/formautofill/test/browser/browser_autocomplete_footer.js
index 1e7ba523e8..1b4c934a38 100644
--- a/browser/extensions/formautofill/test/browser/browser_autocomplete_footer.js
+++ b/browser/extensions/formautofill/test/browser/browser_autocomplete_footer.js
@@ -14,6 +14,15 @@ add_setup(async function setup_storage() {
   );
 });
 
+function getFooterLabel(itemsBox) {
+  let footer = itemsBox.getItemAtIndex(itemsBox.itemCount - 1);
+  while (footer.collapsed) {
+    footer = footer.previousSibling;
+  }
+
+  return footer.querySelector(".line1-label");
+}
+
 add_task(async function test_footer_has_correct_button_text_on_address() {
   await BrowserTestUtils.withNewTab(
     { gBrowser, url: URL },
@@ -23,9 +32,7 @@ add_task(async function test_footer_has_correct_button_text_on_address() {
       } = browser;
 
       await openPopupOn(browser, "#organization");
-      const footer = itemsBox.querySelector(
-        ".autofill-footer-row.autofill-button"
-      );
+      let footer = getFooterLabel(itemsBox);
       Assert.equal(
         footer.innerText,
         l10n.formatValueSync("autofill-manage-addresses-label")
@@ -44,9 +51,7 @@ add_task(async function test_footer_has_correct_button_text_on_credit_card() {
       } = browser;
 
       await openPopupOn(browser, "#cc-number");
-      const footer = itemsBox.querySelector(
-        ".autofill-footer-row.autofill-button"
-      );
+      let footer = getFooterLabel(itemsBox);
       Assert.equal(
         footer.innerText,
         l10n.formatValueSync("autofill-manage-payment-methods-label")
@@ -65,6 +70,7 @@ add_task(async function test_press_enter_on_footer() {
       } = browser;
 
       await openPopupOn(browser, "#organization");
+
       // Navigate to the footer and press enter.
       const listItemElems = itemsBox.querySelectorAll(
         ".autocomplete-richlistitem"
@@ -75,7 +81,7 @@ add_task(async function test_press_enter_on_footer() {
         true
       );
       for (let i = 0; i < listItemElems.length; i++) {
-        if (!listItemElems[i].collapsed) {
+        if (!listItemElems[i].disabled) {
           await BrowserTestUtils.synthesizeKey("VK_DOWN", {}, browser);
         }
       }
@@ -110,7 +116,6 @@ add_task(async function test_click_on_footer() {
       while (optionButton.collapsed) {
         optionButton = optionButton.previousElementSibling;
       }
-      optionButton = optionButton._optionButton;
 
       const prefTabPromise = BrowserTestUtils.waitForNewTab(
         gBrowser,
@@ -140,15 +145,7 @@ add_task(async function test_phishing_warning_single_category() {
   await BrowserTestUtils.withNewTab(
     { gBrowser, url: URL },
     async function (browser) {
-      const {
-        autoCompletePopup: { richlistbox: itemsBox },
-      } = browser;
-
       await openPopupOn(browser, "#tel");
-      const warningBox = itemsBox.querySelector(
-        ".autocomplete-richlistitem:last-child"
-      )._warningTextBox;
-      ok(warningBox, "Got phishing warning box");
       await expectWarningText(browser, "Also autofills address");
       await closePopup(browser);
     }