Merge branch 'main' into philimon/add-new-address

Author: philimon-reset

SELECTOR_INFO.md

@@ -1354,6 +1354,20 @@ Location: Address bar
 Path to .json: modules/data/autofill_popup.components.json
 ```
 ```
+Selector Name: address-doorhanger-email
+Selector Data: "div.address-save-update-row-container:nth-of-type(2) div p:first-of-type span"
+Description: Save address doorhanger email section
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
+Selector Name: address-doorhanger-phone
+Selector Data: "div.address-save-update-row-container:nth-of-type(2) div p:nth-of-type(2) span"
+Description: Save address doorhanger phone section
+Location: Address bar
+Path to .json: modules/data/autofill_popup.components.json
+```
+```
 Selector Name: address-doorhanger-name
 Selector Data: "div.address-save-update-row-container:nth-of-type(1) div p:first-of-type span"
 Description: Save address doorhanger name section

l10n_CM/Unified/test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py

@@ -0,0 +1,63 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object_autofill import AddressFill
+from modules.page_object_prefs import AboutPrefs
+from modules.util import Utilities, BrowserActions
+
+
+@pytest.fixture()
+def test_case():
+    return "2886581"
+
+
+def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(driver: Firefox, region: str
+                                                               ):
+    """
+    C2888704 - Verify tele/email data are captured in the Capture Doorhanger and stored in about:preferences
+    """
+    # instantiate objects
+    address_autofill = AddressFill(driver)
+    address_autofill_popup = AutofillPopup(driver)
+    util = Utilities()
+    browser_action_obj = BrowserActions(driver)
+
+    # create fake data and fill it in
+    address_autofill.open()
+    address_autofill_data = util.fake_autofill_data(region)
+    address_autofill.save_information_basic(address_autofill_data)
+
+    # The "Save address?" doorhanger is displayed
+    address_autofill_popup.element_visible("address-save-doorhanger")
+
+    # containing email field
+    expected_email = address_autofill_data.email
+    address_autofill_popup.element_has_text("address-doorhanger-email", expected_email)
+
+    # containing phone field
+    expected_phone = address_autofill_data.telephone
+    with driver.context(driver.CONTEXT_CHROME):
+        actual_phone = address_autofill_popup.get_element("address-doorhanger-phone").text
+    normalize_expected = util.normalize_phone_number(expected_phone)
+    normalized_actual = util.normalize_phone_number(actual_phone)
+    assert normalized_actual == normalize_expected
+
+    # Click the "Save" button
+    address_autofill_popup.click_doorhanger_button("save")
+
+    # Navigate to about:preferences#privacy => "Autofill" section
+    about_prefs = AboutPrefs(driver, category="privacy").open()
+    iframe = about_prefs.get_save_addresses_popup_iframe()
+    browser_action_obj.switch_to_iframe_context(iframe)
+
+    # The address saved in step 2 is listed in the "Saved addresses" modal: Email and phone
+    elements = about_prefs.get_elements("saved-addresses-values")
+    expected_values = [expected_phone, expected_email]
+    found_email_phone = any(
+        all(value in element.text for value in expected_values)
+        for element in elements
+    )
+    assert (
+        found_email_phone
+    ), "Email or phone were not found in any of the address entries!"

l10n_CM/Unified/test_demo_cc_clear_form.py

@@ -0,0 +1,40 @@
+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 "2886602"
+
+
+def test_cc_clear_form(driver: Firefox):
+    """
+    C2886602 - Verify that clearing the form from any field results in all fields being emptied, regardless of the
+    field from which the clear action was triggered.
+    """
+
+    # 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 = 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, clear form and verify all fields are empty
+    credit_card_fill_obj.open()
+    credit_card_fill_obj.verify_clear_form_all_fields(autofill_popup)

l10n_CM/region/CA.json

@@ -4,8 +4,10 @@
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.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_cc_dropdown-presence.py"
+        "test_demo_cc_dropdown-presence.py",
+        "test_demo_cc_clear_form.py"
     ]
 }

l10n_CM/region/DE.json

@@ -4,8 +4,10 @@
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
         "test_demo_cc_add_new_credit_card.py",
         "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.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"
+        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_clear_form.py"
     ]
 }

l10n_CM/region/FR.json

@@ -6,6 +6,8 @@
         "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"
+        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
+        "test_demo_cc_dropdown-presence.py"
+        "test_demo_cc_clear_form.py"
     ]
 }

modules/browser_object_autofill_popup.py

@@ -49,8 +49,7 @@ def click_autofill_form_option(self) -> BasePage:
 
     def click_clear_form_option(self) -> BasePage:
         """Clicks to clear the saved form option (address or credit card)"""
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("clear-form-option").click()
+        self.click_on("clear-form-option")
         return self
 
     # Interaction with autocomplete list elements

modules/data/autofill_popup.components.json

@@ -85,6 +85,18 @@
         "groups": []
     },
 
+    "address-doorhanger-email": {
+        "selectorData": "div.address-save-update-row-container:nth-of-type(2) div p:first-of-type span",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "address-doorhanger-phone": {
+        "selectorData": "div.address-save-update-row-container:nth-of-type(2) div p:nth-of-type(2) span",
+        "strategy": "css",
+        "groups": []
+    },
+
     "address-doorhanger-name": {
         "selectorData": "div.address-save-update-row-container:nth-of-type(1) div p:first-of-type span",
         "strategy": "css",

modules/page_object_about_pages.py

@@ -5,7 +5,6 @@
     StaleElementReferenceException,
     WebDriverException,
 )
-from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
 

modules/page_object_autofill.py

@@ -303,6 +303,23 @@ def update_cc_exp_year(
         )
         return self
 
+    def verify_clear_form_all_fields(self, autofill_popup_obj: AutofillPopup):
+        """
+        Clears all fields in the form by triggering the clear action from each field in turn. After each clear
+        action, verifies that all fields are empty, regardless of which field initiated the clear.
+        """
+        for field in self.fields:
+            self.click_on("form-field", labels=[field])
+            autofill_popup_obj.click_autofill_form_option()
+            self.click_on("form-field", labels=[field])
+            autofill_popup_obj.click_clear_form_option()
+            # Verify that all fields are blank
+            for f in self.fields:
+                self.element_attribute_contains("form-field", "value", "", labels=[f])
+            # Verify that the 'cc-csc' field does not trigger an autofill dropdown
+            self.double_click("form-field", labels=["cc-csc"])
+            autofill_popup_obj.ensure_autofill_dropdown_not_visible()
+
 
 class LoginAutofill(Autofill):
     """