change faker and aboutpref to allow for better address autofill

Author: philimon-reset

l10n_CM/Unified/test_demo_ad_clear_address_fields.py

@@ -12,11 +12,11 @@ def test_case():
 
 
 def test_demo_ad_clear_address_fields(
-        driver: Firefox,
-        region: str,
-        address_autofill: AddressFill,
-        util: Utilities,
-        autofill_popup: AutofillPopup
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
 ):
     """
     C2888565 - Verify clear functionality after selecting an entry from address fields
@@ -35,7 +35,7 @@ def test_demo_ad_clear_address_fields(
         "address-level2",
         "address-level1",  # This will be skipped for DE/FR
         "postal-code",
-        "country"
+        "country",
     ]
 
     # Loop through each field and perform the autofill test

l10n_CM/Unified/test_demo_ad_clear_name_org.py

@@ -12,11 +12,11 @@ def test_case():
 
 
 def test_demo_ad_clear_name_org(
-        driver: Firefox,
-        region: str,
-        address_autofill: AddressFill,
-        util: Utilities,
-        autofill_popup: AutofillPopup
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
 ):
     """
     C2888560 - Verify clear functionality after selecting an entry from name/org fields
@@ -30,10 +30,7 @@ def test_demo_ad_clear_name_org(
     autofill_popup.click_doorhanger_button("save")
 
     # List of field labels to be autofilled and verified
-    fields_to_test = [
-        "name",
-        "organization"
-    ]
+    fields_to_test = ["name", "organization"]
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:

l10n_CM/Unified/test_demo_ad_clear_tel_email.py

@@ -12,11 +12,11 @@ def test_case():
 
 
 def test_demo_ad_clear_tel_email(
-        driver: Firefox,
-        region: str,
-        address_autofill: AddressFill,
-        util: Utilities,
-        autofill_popup: AutofillPopup
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
 ):
     """
     C2888571 - Verify clear functionality after selecting an entry from tele/email fields
@@ -31,10 +31,7 @@ def test_demo_ad_clear_tel_email(
     autofill_popup.click_doorhanger_button("save")
 
     # List of field labels to be autofilled and verified
-    fields_to_test = [
-        "email",
-        "tel"
-    ]
+    fields_to_test = ["email", "tel"]
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:

l10n_CM/Unified/test_demo_ad_verify_new_address_added.py

@@ -12,11 +12,6 @@ def test_case():
     return "2886580"
 
 
-@pytest.fixture()
-def region():
-    return "US"
-
-
 @pytest.fixture()
 def add_prefs(region: str):
     return [
@@ -39,22 +34,23 @@ def test_verify_new_address_is_added(
     # open saved addresses and add entry
     about_prefs_privacy.open()
     about_prefs_privacy.add_entry_to_saved_addresses(address_autofill_data)
+    driver.switch_to.frame(1)
 
     # verify that the address saved is the same.
     # The address saved in step 2 is listed in the "Saved addresses" modal: name and organization
     elements = about_prefs_privacy.get_element("saved-addresses-values").text.split(",")
     address_match = all(
-        data_sanitizer(element, region, inverted_state_province_abbr)
+        data_sanitizer(util, element, region, inverted_state_province_abbr)
         in address_autofill_data.__dict__.values()
         for element in elements
     )
     assert address_match, "Address found is not equal to address created!"
 
 
-def data_sanitizer(value: str, region: str, state_province: Dict):
+def data_sanitizer(util: Utilities, value: str, region: str, state_province: Dict):
     value = value.strip()
     if value[0] == "+":
-        return value[1:]
+        return util.normalize_phone_number(value)
     elif len(value) == 2 and value != region:
         return state_province.get(value, value)
     return value

l10n_CM/region/US.json

@@ -1,6 +1,4 @@
 {
     "region": "US",
-    "tests": [
-        "test_demo_ad_verify_new_address_added.py"
-    ]
+    "tests": []
 }

l10n_CM/region/Unified.json

@@ -13,11 +13,11 @@
         "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_autofill_address_fields.py"
+        "test_demo_ad_autofill_address_fields.py",
         "test_demo_ad_yellow_highlight_name_org.py",
         "test_demo_ad_yellow_highlight_address.py",
         "test_demo_ad_yellow_highlight_phone_email.py",
-        "test_demo_ad_dropdown_presence_address.py
+        "test_demo_ad_dropdown_presence_address.py",
         "test_demo_ad_clear_name_org.py",
         "test_demo_ad_clear_address_fields.py",
         "test_demo_ad_clear_tel_email.py"

l10n_CM/run_l10n.py

@@ -8,6 +8,7 @@
 valid_flags = {"--run-headless", "-n", "--reruns"}
 flag_with_parameter = {"-n", "--reruns"}
 valid_region = {"US", "CA", "DE", "FR"}
+logging.basicConfig(stream=sys.stdout, level=logging.INFO)
 
 
 def run_tests(reg, flg, all_tests):

modules/classes/autofill_base.py

@@ -10,6 +10,7 @@ class AutofillAddressBase:
     address_level_1: str | None = None
     postal_code: str | None = None
     country: str | None = None
+    country_code: str | None = None
     email: str | None = None
     telephone: str | None = None
     """
@@ -31,6 +32,8 @@ class AutofillAddressBase:
         The postal code for the address.
     country : str | None
         The country of the address.
+    country_code: str | None
+        The code of the country.
     email : str | None
         The email address associated with the address.
     telephone : str | None

modules/data/about_prefs.components.json

@@ -492,6 +492,18 @@
         "groups": []
     },
 
+    "form-container": {
+        "selectorData": "form",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "save-button": {
+        "selectorData": "save",
+        "strategy": "id",
+        "groups": []
+    },
+
     "reenter-new-password": {
         "selectorData": "pw2",
         "strategy": "id",

modules/page_object_autofill.py

@@ -482,7 +482,7 @@ def save_information_basic(self, autofill_info: AutofillAddressBase):
             "address-level2": autofill_info.address_level_2,
             "address-level1": autofill_info.address_level_1,
             "postal-code": autofill_info.postal_code,
-            "country": autofill_info.country,
+            "country": autofill_info.country_code,
             "email": autofill_info.email,
             "tel": autofill_info.telephone,
         }
@@ -547,7 +547,7 @@ def verify_autofill_data(
             "City": autofill_data.address_level_2,
             "State": autofill_data.address_level_1,
             "ZIP Code": autofill_data.postal_code,
-            "Country": autofill_data.country,
+            "Country": autofill_data.country_code,
             "Email": autofill_data.email,
             "Phone": util.normalize_regional_phone_numbers(
                 autofill_data.telephone, region
@@ -661,7 +661,9 @@ def verify_all_fields_cleared(self):
         for field, value in actual_values.items():
             assert not value, f"Field '{field}' is not empty: Found '{value}'"
 
-    def clear_and_verify(self, address_autofill_popup, field_label, address_autofill_data):
+    def clear_and_verify(
+        self, address_autofill_popup, field_label, address_autofill_data
+    ):
         """
         Autofills a form field, clears it, and verifies that it is empty.
         Parameters:
@@ -678,7 +680,10 @@ def clear_and_verify(self, address_autofill_popup, field_label, address_autofill
             The region code to handle localization.
         """
         # Skip address-level1 (State) selection for DE and FR
-        if field_label == "address-level1" and address_autofill_data.country in ["DE", "FR"]:
+        if field_label == "address-level1" and address_autofill_data.country in [
+            "DE",
+            "FR",
+        ]:
             return
 
         # Double-click a field and choose the first element from the autocomplete dropdown