Merge main

Author: Hani Yacoub

l10n_CM/Unified/conftest.py

@@ -157,7 +157,11 @@ def cc_form_field(cc_site_data):
 
 
 @pytest.fixture()
-def address_autofill(driver, ad_site_data, ad_form_field, serve_live_site):
+def address_autofill(
+    driver, ad_site_data, ad_form_field, serve_live_site, live_site, region
+):
+    if ad_site_data.get("skip"):
+        pytest.skip(f"Address tests for {live_site} in {region} region skipped..")
     af = AddressFill(
         driver,
         url_template=ad_site_data.get("url"),
@@ -170,6 +174,8 @@ def address_autofill(driver, ad_site_data, ad_form_field, serve_live_site):
 
 @pytest.fixture()
 def credit_card_autofill(driver, cc_site_data, cc_form_field, serve_live_site):
+    if cc_site_data.get("skip"):
+        pytest.skip(f"Credit Card tests for {live_site} in {region} region skipped..")
     cf = CreditCardFill(
         driver,
         url_template=cc_site_data.get("url"),

l10n_CM/constants/amazon/CA/amazon_cc.json

@@ -1,11 +1,15 @@
 {
   "url": "http://127.0.0.1:8080/amazon_cc.html",
   "field_mapping": {
-    "card_number": "cc-number",
-    "expiration_date": "cc-exp"
+    "card_number": "5c01d093-4e7c-422a-99b3-6c7b9a8cd49f",
+    "expiration_date": "6c5f05c1-72f0-4392-a1ef-a0f7e69ee1b2",
+    "name": "286af831-a430-43ce-893a-a9e5f21a7417"
   },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": "True",
   "fields": [
-    "cc-number",
-    "cc-exp"
+    "5c01d093-4e7c-422a-99b3-6c7b9a8cd49f",
+    "6c5f05c1-72f0-4392-a1ef-a0f7e69ee1b2",
+    "286af831-a430-43ce-893a-a9e5f21a7417"
   ]
 }

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/constants/amazon/DE/amazon_cc.json

@@ -7,6 +7,7 @@
     "cvv":"b7ea2a60-8b59-4a5a-b1b8-e8d640efd511"
   },
   "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": "True",
   "fields": [
     "06014430-b517-476f-8618-f4770f0c078f",
     "31fd4333-af75-4131-939a-d73a36f70fe9",

l10n_CM/constants/amazon/FR/amazon_cc.json

@@ -7,6 +7,7 @@
     "cvv":"68a5e85d-d8c5-4d10-9827-394263770656"
   },
   "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": "True",
   "fields": [
     "4bfc1932-75e6-436c-b195-a443beb1adfc",
     "b48f8715-36a7-4c89-8c64-5a5471f7d9f2",

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")