Yellow highlight on address fields

Author: soncuteanca

l10n_CM/Unified/test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py

@@ -42,7 +42,9 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
     if expected_phone:
         with driver.context(driver.CONTEXT_CHROME):
             actual_phone = autofill_popup.get_element("address-doorhanger-phone").text
-        normalize_expected = util.normalize_regional_phone_numbers(expected_phone, region)
+        normalize_expected = util.normalize_regional_phone_numbers(
+            expected_phone, region
+        )
         normalized_actual = util.normalize_regional_phone_numbers(actual_phone, region)
         assert normalized_actual == normalize_expected, (
             f"Phone number mismatch for {region} | Expected: {normalize_expected}, Got: {normalized_actual}"

l10n_CM/Unified/test_demo_ad_yellow_highlight_address.py

@@ -0,0 +1,56 @@
+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 "2888564"
+
+
+def test_address_yellow_highlight_address_fields(driver: Firefox, region: str):
+    """
+    C2888564 - Verify the yellow highlight appears on autofilled fields for the address fields.
+    """
+
+    # Instantiate objects
+    address_autofill = AddressFill(driver)
+    address_autofill_popup = AutofillPopup(driver)
+    util = Utilities()
+
+    # 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
+    address_autofill_popup.click_doorhanger_button("save")
+
+    # Double click inside street address field and select a saved address entry from the dropdown
+    address_autofill.double_click("form-field", labels=["street-address"])
+
+    # Click on the first element from the autocomplete dropdown
+    first_item = address_autofill_popup.get_nth_element(1)
+    address_autofill_popup.click_on(first_item)
+
+    # Verify the address fields are highlighted
+    address_autofill.verify_field_yellow_highlights(
+        region=region,
+        fields_to_test=[
+            "street-address",
+            "address-level2",
+            "address-level1",
+            "postal-code",
+            "country",
+        ],
+        expected_highlighted_fields=[
+            "street-address",
+            "address-level2",
+            "address-level1",
+            "postal-code",
+            "country",
+        ],
+    )

l10n_CM/Unified/test_demo_ad_yellow_highlight.py renamed to l10n_CM/Unified/test_demo_ad_yellow_highlight_name_org.py

@@ -31,7 +31,7 @@ def test_address_yellow_highlight_on_name_organization_fields(
     # Click the "Save" button
     address_autofill_popup.click_doorhanger_button("save")
 
-    # Double click inside phone field and select a saved address entry from the dropdown
+    # Double click inside name field and select a saved address entry from the dropdown
     address_autofill.double_click("form-field", labels=["name"])
 
     # Click on the first element from the autocomplete dropdown

modules/page_object_autofill.py

@@ -559,11 +559,15 @@ def verify_autofill_data(
             )
 
     def verify_field_yellow_highlights(
-        self, fields_to_test=None, expected_highlighted_fields=None
+        self, region=None, fields_to_test=None, expected_highlighted_fields=None
     ):
         if fields_to_test is None:
             fields_to_test = self.fields  # By default, test all address fields
 
+        # Skip 'address-level1' if region is DE or FR
+        if region in ["DE", "FR"] and "address-level1" in fields_to_test:
+            fields_to_test.remove("address-level1")
+
         return self.verify_field_highlight(
             fields_to_test=fields_to_test,
             expected_highlighted_fields=expected_highlighted_fields,

modules/util.py

@@ -499,15 +499,17 @@ def normalize_regional_phone_numbers(self, phone: str, region: str) -> str:
         digits = re.sub(r"\D", "", phone)
 
         # Determine country code
-        country_code = country_codes.get(region, "1")  # Default to "1" (US/CA) if region is unknown
+        country_code = country_codes.get(
+            region, "1"
+        )  # Default to "1" (US/CA) if region is unknown
         local_number = digits
 
         # Check if phone already contains a valid country code
         for code in country_codes.values():
             if digits.startswith(code):
                 country_code = code
                 # Remove country code from local number
-                local_number = digits[len(code):]
+                local_number = digits[len(code) :]
                 break
 
         # Handle leading zero in local numbers (France & Germany)