Merge branch 'main' into philimon/l10n_report

Author: philimon-reset

l10n_CM/constants/amazon/DE/amazon_ad.json

@@ -5,7 +5,6 @@
     "name": "28f5f493-ad18-4e7c-99fa-524bc768ed7a",
     "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"
   },
@@ -15,7 +14,6 @@
     "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",
     "e38f3160-4ce5-4804-b5d5-b92c3ccc499e"
   ]

l10n_CM/run_l10n.py

@@ -13,7 +13,15 @@
 valid_flags = {"--run-headless", "-n", "--reruns", "--fx-executable", "--ci"}
 flag_with_parameter = {"-n", "--reruns"}
 valid_region = {"US", "CA", "DE", "FR"}
-valid_sites = {"demo", "amazon", "walmart", "mediamarkt", "lowes", "etsy", "calvinklein"}
+valid_sites = {
+    "demo",
+    "amazon",
+    "walmart",
+    "mediamarkt",
+    "lowes",
+    "etsy",
+    "calvinklein",
+}
 live_sites = []
 
 LOCALHOST = "127.0.0.1"

modules/page_object_autofill.py

@@ -245,7 +245,8 @@ def verify_form_data(self, sample_data: CreditCardBase | AutofillAddressBase):
                 )
             elif attr_name == "expiration_date" and len(autofilled_field_value) > 5:
                 autofilled_field_value = autofilled_field_value.replace("20", "")
-
+            elif attr_name == "country":
+                expected_value = self.util.get_country_local_translation(expected_value)
             if autofilled_field_value.isdigit():
                 # Handle expiration month comparison - normalize to integers to handle leading zeros
                 autofilled_field_value = str(int(autofilled_field_value))

modules/util.py

@@ -103,6 +103,8 @@ def __init__(self):
             "Nunavut": "NU",
             "Yukon": "YT",
         }
+        # temporary fix until faker issue is resolved
+        self.country_local_translation = {"Germany": "Deutschland"}
         self.fake = None
         self.locale = None
 
@@ -519,6 +521,15 @@ def get_state_province_abbreviation(self, full_name: str) -> str:
         """
         return self.state_province_abbr.get(full_name, "Not Found")
 
+    def get_country_local_translation(self, country_name: str) -> str:
+        """
+        Returns the local translation of the country name.
+
+        :param country_name: The full name of the country in english
+        :return: The corresponding translation in the local language or the english name itself if not in the dictionary.
+        """
+        return self.country_local_translation.get(country_name, country_name)
+
     def normalize_regional_phone_numbers(self, phone: str, region: str) -> str:
         """
         Normalizes a phone number by separating the country prefix and verifying the rest of the number as an integer.

tests/password_manager/test_primary_password_triggered_on_about_logins_access.py

@@ -73,7 +73,6 @@ def test_primary_password_triggered_on_about_logins_access_via_hamburger_menu(
     # Attempt to view the saved password in order to trigger the primary password prompt
     about_logins.element_visible("show-password-checkbox")
     about_logins.click_on("show-password-checkbox")
-
     # Dismiss the primary password prompt without entering the password
     with driver.context(driver.CONTEXT_CHROME):
         driver.switch_to.window(driver.window_handles[-1])
@@ -84,9 +83,9 @@ def test_primary_password_triggered_on_about_logins_access_via_hamburger_menu(
     tabs.switch_to_new_tab()
     panel_ui.open_panel_menu()
     panel_ui.redirect_to_about_logins_page()
-
     # Verify that the primary password prompt appears and enter the primary password
     with driver.context(driver.CONTEXT_CHROME):
+        tabs.wait_for_num_tabs(2)
         driver.switch_to.window(driver.window_handles[-1])
         # Fetch a fresh reference to avoid staling
         primary_password_prompt = about_logins.get_element("primary-password-prompt")