Merge branch 'main' of github.com:mozilla/fx-desktop-qa-automation

Author: ben-c-at-moz

l10n_CM/Unified/test_demo_ad_yellow_highlight_address.py

@@ -0,0 +1,60 @@
+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,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
+):
+    """
+    C2888564 - Verify the yellow highlight appears on autofilled fields for the address fields.
+    """
+
+    # Instantiate objects
+    address_autofill_popup = AutofillPopup(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)
+
+    # 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

@@ -14,8 +14,8 @@ def test_case():
 def test_address_yellow_highlight_on_name_organization_fields(
     driver: Firefox,
     region: str,
-    util: Utilities,
     address_autofill: AddressFill,
+    util: Utilities,
     autofill_popup: AutofillPopup,
 ):
     """
@@ -30,7 +30,7 @@ def test_address_yellow_highlight_on_name_organization_fields(
     # Click the "Save" button
     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

l10n_CM/region/Unified.json

@@ -1,18 +1,21 @@
 {
   "tests": [
-    "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
-    "test_demo_ad_autofill_name_org.py",
-    "test_demo_ad_autofill_phone_email.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_yellow_highlight.py",
-    "test_demo_cc_add_new_credit_card.py",
-    "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_ad_verify_new_address_added.py",
-    "test_demo_ad_yellow_highlight_phone_email.py"
+        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
+        "test_demo_ad_autofill_name_org.py",
+        "test_demo_ad_autofill_phone_email.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_verify_new_address_added.py",
+        "test_demo_cc_add_new_credit_card.py",
+        "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_yellow_highlight.py",
+        "test_demo_ad_yellow_highlight_name_org.py",
+        "test_demo_ad_yellow_highlight_address.py",
+        "test_demo_ad_yellow_highlight_phone_email.py"
+
   ]
 }

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,