merge main

Author: Hani Yacoub

l10n_CM/Unified/test_demo_cc_dropdown-presence.py

@@ -0,0 +1,41 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object import AboutPrefs, CreditCardFill
+from modules.util import BrowserActions, Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2886598"
+
+
+def test_dropdown_presence_credit_card(driver: Firefox):
+    """
+    C2886598 - Verify autofill dropdown is displayed only for the eligible fields after a credit card is saved
+    """
+
+    # Initialize objects
+    util = Utilities()
+    about_prefs = AboutPrefs(driver, category="privacy")
+    about_prefs_cc_popup = AboutPrefs(driver)
+    browser_action_obj = BrowserActions(driver)
+    credit_card_fill_obj = CreditCardFill(driver)
+    autofill_popup_obj = AutofillPopup(driver)
+
+    # Save a credit card in about:preferences
+    about_prefs.open()
+    iframe = about_prefs.get_saved_payments_popup_iframe()
+    browser_action_obj.switch_to_iframe_context(iframe)
+    credit_card_sample_data = util.fake_credit_card_data()
+    about_prefs_cc_popup.click_on(
+        "panel-popup-button", labels=["autofill-manage-add-button"]
+    )
+    about_prefs.fill_cc_panel_information(credit_card_sample_data)
+
+    # Open credit card form page
+    credit_card_fill_obj.open()
+
+    # Verify autofill dropdown is displayed only for the eligible fields
+    credit_card_fill_obj.verify_autofill_dropdown_all_fields(autofill_popup_obj)

l10n_CM/region/CA.json

@@ -5,6 +5,7 @@
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
         "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
-        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py"
+        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py"
     ]
 }

l10n_CM/region/DE.json

@@ -5,6 +5,7 @@
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
         "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py",
         "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py"
     ]
 }

l10n_CM/region/FR.json

@@ -5,6 +5,7 @@
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
         "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py",
         "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py"
     ]
 }

l10n_CM/region/US.json

@@ -5,6 +5,7 @@
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
         "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py",
         "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py"
     ]
 }

modules/browser_object_autofill_popup.py

@@ -23,18 +23,15 @@ def verify_element_displayed(self, reference: Union[str, tuple, WebElement]):
         """Confirms that an element exists in popup"""
         self.element_clickable(reference)
 
-    def verify_no_popup_panel(self):
-        """Verifies that the autofill popup does NOT appear"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            element = self.get_element("autofill-panel")
-            self.expect_not(EC.element_to_be_clickable(element))
+    def ensure_autofill_dropdown_not_visible(self):
+        """Verifies that the autofill dropdown does NOT appear"""
+        self.element_not_visible("select-form-option")
+        return self
 
-    def verify_popup(self):
-        """Verifies that the autofill popup is clickable"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.expect(
-                EC.element_to_be_clickable(self.get_element("select-form-option"))
-            )
+    def ensure_autofill_dropdown_visible(self):
+        """Verifies that the autofill dropdown appears"""
+        self.element_visible("select-form-option")
+        return self
 
     # Interaction with popup elements
     def click_doorhanger_button(self, button_type: str) -> BasePage:

modules/page_object_autofill.py

@@ -73,11 +73,14 @@ def fill_credit_card_info(self, info: CreditCardBase):
 
         self.click_form_button("submit")
 
-    def verify_all_fields(self, ccp: AutofillPopup):
+    def verify_autofill_dropdown_all_fields(self, ccp: AutofillPopup):
         """Given a CreditCardPopup object, verify all fields"""
         for field in self.fields:
             self.double_click("form-field", labels=[field])
-            ccp.verify_popup()
+            ccp.ensure_autofill_dropdown_visible()
+        # Ensure 'cc-csc' does NOT trigger the autofill dropdown
+        self.double_click("form-field", labels=["cc-csc"])
+        ccp.ensure_autofill_dropdown_not_visible()
 
     def verify_four_fields(
         self, ccp: AutofillPopup, credit_card_sample_data: CreditCardBase

tests/form_autofill/test_autofill_credit_card.py

@@ -24,4 +24,4 @@ def test_autofill_credit_card(driver: Firefox):
     credit_card_fill_obj.fill_credit_card_info(credit_card_sample_data)
     autofill_popup_obj.click_doorhanger_button("save")
 
-    credit_card_fill_obj.verify_all_fields(autofill_popup_obj)
+    credit_card_fill_obj.verify_autofill_dropdown_all_fields(autofill_popup_obj)

tests/form_autofill/test_autofill_credit_card_enable.py

@@ -31,4 +31,4 @@ def test_enable_disable_form_autofill_cc(driver: Firefox):
     new_autofill_popup_obj = AutofillPopup(driver)
 
     new_credit_card_fill_obj.double_click("form-field", labels=["cc-name"])
-    new_autofill_popup_obj.verify_no_popup_panel()
+    new_autofill_popup_obj.ensure_autofill_dropdown_not_visible()

tests/form_autofill/test_enable_disable_autofill.py

@@ -39,4 +39,4 @@ def test_enable_disable_autofill(driver: Firefox):
 
     # verifying the popup panel does not appear
     new_af.double_click("form-field", labels=["name"])
-    new_afp.verify_no_popup_panel()
+    new_afp.ensure_autofill_dropdown_not_visible()