amazon address field working

Author: philimon-reset

l10n_CM/Unified/conftest.py

@@ -40,7 +40,7 @@ def prefs_list(add_to_prefs_list: List[tuple[str, str | bool]], region: str):
 def site_data():
     # live_site = os.environ.get("FX_SITE", None)
     # un comment to test a live site form
-    live_site = "walmart/walmart_ad"
+    live_site = "amazon/amazon_ad"
     if live_site:
         path_to_site = parent_dir + "/constants/"
         with open(path_to_site + live_site + ".json", "r") as fp:
@@ -65,17 +65,31 @@ def field_mapping(site_data):
 
 
 @pytest.fixture()
-def address_autofill(driver, url_template, fields, field_mapping):
-    return AddressFill(
+def form_field(site_data):
+    selector = site_data.get("form_field", None)
+    return (
+        {"form-field": {"selectorData": selector, "strategy": "css", "groups": []}}
+        if selector
+        else {}
+    )
+
+
+@pytest.fixture()
+def address_autofill(driver, url_template, fields, field_mapping, form_field):
+    af = AddressFill(
         driver, url_template=url_template, field_mapping=field_mapping, fields=fields
     )
+    af.elements |= form_field
+    return af
 
 
 @pytest.fixture()
-def credit_card_autofill(driver, url_template, fields, field_mapping):
-    return CreditCardFill(
+def credit_card_autofill(driver, url_template, fields, field_mapping, form_field):
+    cf = CreditCardFill(
         driver, url_template=url_template, field_mapping=field_mapping, fields=fields
     )
+    cf.elements |= form_field
+    return cf
 
 
 @pytest.fixture()

l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py

@@ -30,13 +30,16 @@ def test_address_yellow_highlight_on_name_organization_fields(
         address_autofill.open()
 
         # Double click inside name field and select a saved address entry from the dropdown
-        address_autofill.click_form_field("name")
+        if address_autofill.is_field_present("name"):
+            address_autofill.click_form_field("name")
+        else:
+            address_autofill.click_form_field("given_name")
         autofill_popup.ensure_autofill_dropdown_visible()
 
         # Click on the first element from the autocomplete dropdown
         autofill_popup.select_nth_element(1)
 
-        field_to_test = ["name", "organization"]
+        field_to_test = ["given_name", "family_name", "name", "organization"]
         # Verify the name and organization fields are highlighted
         address_autofill.verify_field_highlight(
             fields_to_test=field_to_test,

l10n_CM/constants/amazon/amazon_ad.json

@@ -1,19 +1,20 @@
 {
   "url": "http://127.0.0.1:8000/amazon.html",
   "field_mapping": {
-    "name": "name",
-    "street_address": "address-ui-widgets-enterAddressLine1",
-    "address_level_2": "address-ui-widgets-enterAddressLine2",
-    "address_level_1": "address-ui-widgets-enterAddressCity",
-    "postal_code": "address-ui-widgets-enterAddressPostalCode",
-    "telephone": "tel"
+    "name": "152ffe55-1b63-4bf7-a43c-21d217d8aca1",
+    "street_address": "33198fca-ddab-40a0-bc03-8b6f83bc3a98",
+    "address_level_2": "bf3bb4bd-06fc-493b-a8d5-7c2c31db66cb",
+    "address_level_1": "be3c9233-db95-4cf4-aa79-9f3c9e0bbe5c",
+    "postal_code": "543e09ec-34d0-4f72-846c-5ae35a323ba8",
+    "telephone": "581c61d2-1257-4da2-9899-9d18e92b6fc4"
   },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
   "fields": [
-    "name",
-    "address-ui-widgets-enterAddressLine1",
-    "address-ui-widgets-enterAddressLine2",
-    "address-ui-widgets-enterAddressCity",
-    "address-ui-widgets-enterAddressPostalCode",
-    "tel"
+    "152ffe55-1b63-4bf7-a43c-21d217d8aca1",
+    "581c61d2-1257-4da2-9899-9d18e92b6fc4",
+    "bf3bb4bd-06fc-493b-a8d5-7c2c31db66cb",
+    "be3c9233-db95-4cf4-aa79-9f3c9e0bbe5c",
+    "543e09ec-34d0-4f72-846c-5ae35a323ba8",
+    "33198fca-ddab-40a0-bc03-8b6f83bc3a98"
   ]
 }

modules/page_object_autofill.py

@@ -48,6 +48,15 @@
     "tel",
 )
 
+# Preview field mappings
+base_preview_address_mapping = {}
+base_preview_cc_mapping = {
+    "name": "cc-name",
+    "card_number": "cc-number",
+    "expiration_month": "cc-exp-month",
+    "expiration_year": "cc-exp-year",
+}
+
 
 class Autofill(BasePage):
     """
@@ -57,7 +66,8 @@ class Autofill(BasePage):
 
     # Default; subclasses will override
     field_mapping = {}
-    fields = []
+    fields = {}
+    preview_fields = {}
 
     URL_TEMPLATE = "https://mozilla.github.io/form-fill-examples/"
 
@@ -377,7 +387,7 @@ def verify_autofill_data_on_hover(
             raise ValueError("Given preview data is incomplete.")
         container_data = container.get("fillMessageData", {}).get("profile", {})
         assert container_data, "No preview data available."
-        assert all(field in container_data.keys() for field in self.fields), (
+        assert all(field in container_data.keys() for field in self.preview_fields), (
             "Not all fields present in preview data."
         )
 
@@ -395,7 +405,7 @@ def verify_autofill_data_on_hover(
                     )
                 )
         for field, value in container_data.items():
-            if field in self.fields:
+            if field in self.preview_fields:
                 value = self.sanitize_preview_data(field, str(value))
                 # Check if this value exists in our CreditCardBase | AutofillAddressBase object
                 assert value in autofill_data.__dict__.values(), (
@@ -615,6 +625,15 @@ def __init__(
             field_mapping if field_mapping else base_address_field_mapping
         )
         self.fields = fields if fields else base_address_fields
+        self.preview_fields = set(
+            map(
+                lambda field: base_address_field_mapping.get(field, field),
+                self.field_mapping.keys(),
+            )
+        )
+        self.preview_fields = {
+            field for field in self.preview_fields if field is not None
+        }
         self.URL_TEMPLATE = url_template if url_template else BASE_ADDRESS_URL_TEMPLATE
 
 
@@ -635,6 +654,15 @@ def __init__(
         super().__init__(driver, **kwargs)
         self.field_mapping = field_mapping if field_mapping else base_cc_field_mapping
         self.fields = fields if fields else base_cc_fields
+        self.preview_fields = set(
+            map(
+                lambda field: base_preview_cc_mapping.get(field),
+                self.field_mapping.keys(),
+            )
+        )
+        self.preview_fields = {
+            field for field in self.preview_fields if field is not None
+        }
         self.URL_TEMPLATE = url_template if url_template else BASE_CC_URL_TEMPLATE