Merge pull request #624 from mozilla/philimon/l10n_fixes

l10n fixes

Author: philimon-reset

l10n_CM/constants/amazon/DE/amazon_ad.json

@@ -3,8 +3,8 @@
   "field_mapping": {
     "country": "90b596de-e266-4e66-9530-2e41b184555d",
     "name": "28f5f493-ad18-4e7c-99fa-524bc768ed7a",
-    "telephone": "28f5f493-ad18-4e7c-99fa-524bc768ed7a",
-    "address_level_1": "a5fb9e4c-60a0-42a2-9e4a-6a067b55d208",
+    "telephone": "c384d303-3e2b-4b8a-ba89-c741056fc9b4",
+    "street_address": "a5fb9e4c-60a0-42a2-9e4a-6a067b55d208",
     "organization": "9e8475b3-e1a5-46cf-9af0-6f2caab918fe",
     "address_level_2": "67cbe0f8-dbe4-4afd-a077-765186bcf0b3",
     "postal_code": "e38f3160-4ce5-4804-b5d5-b92c3ccc499e"
@@ -13,7 +13,7 @@
   "fields": [
     "90b596de-e266-4e66-9530-2e41b184555d",
     "28f5f493-ad18-4e7c-99fa-524bc768ed7a",
-    "28f5f493-ad18-4e7c-99fa-524bc768ed7a",
+    "c384d303-3e2b-4b8a-ba89-c741056fc9b4",
     "a5fb9e4c-60a0-42a2-9e4a-6a067b55d208",
     "9e8475b3-e1a5-46cf-9af0-6f2caab918fe",
     "67cbe0f8-dbe4-4afd-a077-765186bcf0b3",

l10n_CM/constants/amazon/FR/amazon_ad.json

@@ -1,20 +1,20 @@
 {
   "url": "http://127.0.0.1:8080/amazon_ad.html",
   "field_mapping": {
-    "country": "da8fcb20-ecdb-44de-8fe6-d0086af67e96",
-    "name": "53cea474-f431-4d44-bf79-83e28ff8afc1",
-    "telephone": "c75098c8-1441-4e12-93bd-e213af1dc745",
-    "address_level_1": "e1311f61-d43d-403a-94b4-127107489157",
-    "address_level_2": "3809592b-2557-4035-b089-1adbe42a51ad",
-    "postal_code": "122f5d67-36a2-47c7-b759-8ab92103d602"
+    "country": "ec708d25-c69f-48a6-80f1-be4e96b6db04",
+    "name": "87e21b43-187e-400b-bd9d-fd889f9fbaa0",
+    "telephone": "499c2ea7-72a7-4e8f-8f76-5e37bb793016",
+    "street_address": "3f36ea97-c7d4-4334-baba-ed7bb1d31230",
+    "address_level_2": "ef31ec08-7a7a-4a82-b68e-495d3154700c",
+    "postal_code": "71d96b8d-e26c-4aab-bfd7-b2bdb6b4ceb7"
   },
   "form_field": "*[data-moz-autofill-inspect-id='{name}']",
   "fields": [
-    "da8fcb20-ecdb-44de-8fe6-d0086af67e96",
-    "53cea474-f431-4d44-bf79-83e28ff8afc1",
-    "c75098c8-1441-4e12-93bd-e213af1dc745",
-    "e1311f61-d43d-403a-94b4-127107489157",
-    "3809592b-2557-4035-b089-1adbe42a51ad",
-    "122f5d67-36a2-47c7-b759-8ab92103d602"
+    "ec708d25-c69f-48a6-80f1-be4e96b6db04",
+    "87e21b43-187e-400b-bd9d-fd889f9fbaa0",
+    "499c2ea7-72a7-4e8f-8f76-5e37bb793016",
+    "3f36ea97-c7d4-4334-baba-ed7bb1d31230",
+    "ef31ec08-7a7a-4a82-b68e-495d3154700c",
+    "71d96b8d-e26c-4aab-bfd7-b2bdb6b4ceb7"
   ]
 }

l10n_CM/constants/amazon/FR/amazon_cc.json

@@ -9,7 +9,7 @@
   "form_field": "*[data-moz-autofill-inspect-id='{name}']",
   "fields": [
     "4bfc1932-75e6-436c-b195-a443beb1adfc",
-    "4f630b6e-efd1-458d-9762-9a12a3dd28de",
+    "b48f8715-36a7-4c89-8c64-5a5471f7d9f2",
     "fe1bdc2d-e0e3-477b-9d4a-416221ad0851",
     "68a5e85d-d8c5-4d10-9827-394263770656"
   ]

modules/page_object_autofill.py

@@ -146,6 +146,7 @@ def click_form_field(self, attr_name: str):
         """Click the form field given the attribute name."""
         field = self.field_mapping.get(attr_name, None)
         if field:
+            self.get_element("form-field", labels=[field]).clear()
             self.double_click("form-field", labels=[field])
         else:
             logging.warning(f"The field: {attr_name} is not available in the site.")
@@ -236,12 +237,14 @@ def verify_form_data(self, sample_data: CreditCardBase | AutofillAddressBase):
                     autofilled_field
                 ).first_selected_option.text
             if (
-                field_name == "address-level1"
+                attr_name == "address_level_1"
                 and autofilled_field_value != expected_value
             ):
                 expected_value = self.util.get_state_province_abbreviation(
                     expected_value
                 )
+            elif attr_name == "expiration_date" and len(autofilled_field_value) > 5:
+                autofilled_field_value = autofilled_field_value.replace("20", "")
             assert expected_value in autofilled_field_value, (
                 f"{autofilled_field_value} is different from {expected_value}"
             )
@@ -282,6 +285,7 @@ def verify_field_autofill_dropdown(
             if field:
                 autofill_field = self.get_element("form-field", labels=[field])
                 if autofill_field.tag_name.lower() != "select":
+                    autofill_field.clear()
                     # more general way of activating the dropdown
                     self.double_click("form-field", labels=[field])
                     autofill_field.send_keys("")
@@ -370,13 +374,14 @@ def is_yellow_highlight(rgb_tuple):
             if field:
                 autofill_field = self.get_element("form-field", labels=[field])
                 if autofill_field.tag_name.lower() != "select":
+                    autofill_field.clear()
                     # Focus the field so the highlight is visible
                     self.click_on("form-field", labels=[field])
 
                     # Get all colors in the field
                     selector = self.get_selector("form-field", labels=[field])
                     colors = self.browser_actions.get_all_colors_in_element(selector)
-                    logging.info(f"Colors found in '{field}': {colors}")
+                    logging.info(f"Colors found in '{field_name}': {colors}")
 
                     # Check the highlight
                     is_field_highlighted = any(
@@ -387,20 +392,24 @@ def is_yellow_highlight(rgb_tuple):
                     # Assert based on expectation
                     if should_be_highlighted:
                         assert is_field_highlighted, (
-                            f"Expected yellow highlight on '{field}', but none found."
+                            f"Expected yellow highlight on '{field_name}', but none found."
                         )
-                        logging.info(f"Yellow highlight found in '{field}'.")
+                        logging.info(f"Yellow highlight found in '{field_name}'.")
                     else:
                         assert not is_field_highlighted, (
-                            f"Expected NO yellow highlight on '{field}', but found one."
+                            f"Expected NO yellow highlight on '{field_name}', but found one."
+                        )
+                        logging.info(
+                            f"No yellow highlight in '{field_name}', as expected."
                         )
-                        logging.info(f"No yellow highlight in '{field}', as expected.")
                 else:
                     logging.info(
-                        f"Field: {field} is a select element. No autofill option."
+                        f"Field: {field_name} is a select element. No autofill option."
                     )
             else:
-                logging.warning(f"The field: {field} is not available in the site.")
+                logging.warning(
+                    f"The field: {field_name} is not available in the site."
+                )
 
         return self
 
@@ -470,7 +479,7 @@ def sanitize_preview_data(self, field, value):
             value = value[-4:]
         elif field == "cc-exp-year":
             value = value[-2:]
-        elif value[0] == "+":
+        elif field == "tel" or value[0] == "+":
             value = self.util.normalize_phone_number(value)
         return value
 
@@ -485,6 +494,7 @@ def select_autofill_option(self, field, index: int = 1):
         """
         autofill_field = self.get_element("form-field", labels=[field])
         if autofill_field.tag_name.lower() != "select":
+            autofill_field.clear()
             self.double_click("form-field", labels=[field])
             self.autofill_popup.ensure_autofill_dropdown_visible()
             self.autofill_popup.select_nth_element(index)
@@ -554,6 +564,7 @@ def check_autofill_preview_for_field(
         if field:
             autofill_field = self.get_element("form-field", labels=[field])
             if autofill_field.tag_name.lower() != "select":
+                autofill_field.clear()
                 self.double_click("form-field", labels=[field])
                 self.autofill_popup.ensure_autofill_dropdown_visible()
                 self.autofill_popup.hover("select-form-option")
@@ -609,6 +620,7 @@ def clear_and_verify(
         if field:
             autofill_field = self.get_element("form-field", labels=[field])
             if autofill_field.tag_name.lower() != "select":
+                autofill_field.clear()
                 # Double-click a field and choose the first element from the autocomplete dropdown
                 self.double_click("form-field", labels=[field])
                 self.autofill_popup.ensure_autofill_dropdown_visible()