Merge branch 'main' into as/dropdown-presence-addresses

Author: soncuteanca

l10n_CM/Unified/test_demo_ad_clear_address_fields.py

@@ -0,0 +1,43 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object_autofill import AddressFill
+from modules.util import Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2888565"
+
+
+def test_demo_ad_clear_address_fields(
+        driver: Firefox,
+        region: str,
+        address_autofill: AddressFill,
+        util: Utilities,
+        autofill_popup: AutofillPopup
+):
+    """
+    C2888565 - Verify clear functionality after selecting an entry from address fields
+    """
+    # 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)
+
+    # Click the "Save" button
+    autofill_popup.click_doorhanger_button("save")
+
+    # List of field labels to be autofilled and verified
+    fields_to_test = [
+        "street-address",
+        "address-level2",
+        "address-level1",  # This will be skipped for DE/FR
+        "postal-code",
+        "country"
+    ]
+
+    # Loop through each field and perform the autofill test
+    for field in fields_to_test:
+        address_autofill.clear_and_verify(autofill_popup, field, address_autofill_data)

l10n_CM/Unified/test_demo_ad_clear_name_org.py

@@ -0,0 +1,40 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object_autofill import AddressFill
+from modules.util import Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2888560"
+
+
+def test_demo_ad_clear_name_org(
+        driver: Firefox,
+        region: str,
+        address_autofill: AddressFill,
+        util: Utilities,
+        autofill_popup: AutofillPopup
+):
+    """
+    C2888560 - Verify clear functionality after selecting an entry from name/org fields
+    """
+    # 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)
+
+    # Click the "Save" button
+    autofill_popup.click_doorhanger_button("save")
+
+    # List of field labels to be autofilled and verified
+    fields_to_test = [
+        "name",
+        "organization"
+    ]
+
+    # Loop through each field and perform the autofill test
+    for field in fields_to_test:
+        address_autofill.clear_and_verify(autofill_popup, field, address_autofill_data)

l10n_CM/Unified/test_demo_ad_clear_tel_email.py

@@ -0,0 +1,41 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object_autofill import AddressFill
+from modules.util import Utilities
+
+
+@pytest.fixture()
+def test_case():
+    return "2888571"
+
+
+def test_demo_ad_clear_tel_email(
+        driver: Firefox,
+        region: str,
+        address_autofill: AddressFill,
+        util: Utilities,
+        autofill_popup: AutofillPopup
+):
+    """
+    C2888571 - Verify clear functionality after selecting an entry from tele/email fields
+    """
+
+    # 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)
+
+    # Click the "Save" button
+    autofill_popup.click_doorhanger_button("save")
+
+    # List of field labels to be autofilled and verified
+    fields_to_test = [
+        "email",
+        "tel"
+    ]
+
+    # Loop through each field and perform the autofill test
+    for field in fields_to_test:
+        address_autofill.clear_and_verify(autofill_popup, field, address_autofill_data)

l10n_CM/region/Unified.json

@@ -11,12 +11,15 @@
         "test_demo_cc_clear_form.py",
         "test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py",
         "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
-        "test_demo_cc_dropdown-presence.py",
+        "test_demo_cc_dropdown_presence.py",
         "test_demo_cc_yellow_highlight.py",
         "test_demo_ad_autofill_address_fields.py"
         "test_demo_ad_yellow_highlight_name_org.py",
         "test_demo_ad_yellow_highlight_address.py",
         "test_demo_ad_yellow_highlight_phone_email.py",
         "test_demo_ad_dropdown_presence_address.py
+        "test_demo_ad_clear_name_org.py",
+        "test_demo_ad_clear_address_fields.py",
+        "test_demo_ad_clear_tel_email.py"
   ]
 }

modules/page_object_autofill.py

@@ -635,6 +635,64 @@ def autofill_and_verify(
         self.double_click("form-field", labels=[field_label])
         address_autofill_popup.click_clear_form_option()
 
+    def verify_all_fields_cleared(self):
+        """
+        Verifies that all autofill fields are empty.
+        """
+        field_mapping = {
+            "Name": "name-field",
+            "Organization": "org-field",
+            "Street Address": "street-field",
+            "City": "add-level2-field",
+            "State": "add-level1-field",
+            "ZIP Code": "zip-field",
+            "Country": "country-field",
+            "Email": "email-field",
+            "Phone": "phone-field",
+        }
+
+        # Get actual values from web elements
+        actual_values = {
+            field: self.get_element(locator).get_attribute("value")
+            for field, locator in field_mapping.items()
+        }
+
+        # Validate each field is empty
+        for field, value in actual_values.items():
+            assert not value, f"Field '{field}' is not empty: Found '{value}'"
+
+    def clear_and_verify(self, address_autofill_popup, field_label, address_autofill_data):
+        """
+        Autofills a form field, clears it, and verifies that it is empty.
+        Parameters:
+        ----------
+        address_autofill : AddressFill
+            The address autofill handler.
+        address_autofill_popup : AutofillPopup
+            The popup handler for autofill suggestions.
+        field_label : str
+            The label of the field being autofilled.
+        address_autofill_data : dict
+            The generated autofill data for verification.
+        region : str
+            The region code to handle localization.
+        """
+        # Skip address-level1 (State) selection for DE and FR
+        if field_label == "address-level1" and address_autofill_data.country in ["DE", "FR"]:
+            return
+
+        # Double-click a field and choose the first element from the autocomplete dropdown
+        self.double_click("form-field", labels=[field_label])
+        first_item = address_autofill_popup.get_nth_element(1)
+        address_autofill_popup.click_on(first_item)
+
+        # Clear form autofill
+        self.double_click("form-field", labels=[field_label])
+        address_autofill_popup.click_clear_form_option()
+
+        # Verify all fields are cleared
+        self.verify_all_fields_cleared()
+
 
 class TextAreaFormAutofill(Autofill):
     """