Merge branch 'main' into philimon/suite_refactor

Author: philimon-reset

SELECTOR_INFO.md

@@ -459,6 +459,20 @@ Location: about:preferences#search
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
+Selector Name: form-container
+Selector Data: "form"
+Description: Form to to fill in saved addresses data
+Location: about:preferences#privacy
+Path to .json: modules/data/about_prefs.components.json
+```
+```
+Selector Name: save-button
+Selector Data: "save"
+Description: Button to save filled in address form.
+Location: about:preferences#privacy
+Path to .json: modules/data/about_prefs.components.json
+```
+```
 Selector Name: find-in-settings
 Selector Data: "searchInput"
 Description: Find in Settings input field (is a shadow root)

l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py

@@ -56,11 +56,12 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
     autofill_popup.element_has_text(zip_selector, expected_zip)
 
     # Containing Country field
-    expected_country = address_autofill_data.country
+    expected_country = address_autofill_data.country_code
 
     autofill_popup.element_has_text("address-doorhanger-country", expected_country)
 
     # Click the "Save" button
+
     autofill_popup.click_doorhanger_button("save")
 
     # Navigate to about:preferences#privacy => "Autofill" section

l10n_CM/Unified/test_demo_ad_autofill_dropdown_present_for_email_and_phone.py

@@ -12,11 +12,11 @@ def test_case():
 
 
 def test_dropdown_presence_email_phone_field(
-        driver: Firefox,
-        region: str,
-        address_autofill: AddressFill,
-        util: Utilities,
-        autofill_popup: AutofillPopup,
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
 ):
     """
     C2888567 - Verify that the autofill dropdown is displayed for the email and phone fields

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_to_prefs_list(region: str):
     return [
@@ -38,23 +33,25 @@ def test_verify_new_address_is_added(
 
     # open saved addresses and add entry
     about_prefs_privacy.open()
+    about_prefs_privacy.get_saved_addresses_popup().click()
     about_prefs_privacy.add_entry_to_saved_addresses(address_autofill_data)
+    about_prefs_privacy.switch_to_saved_addresses_popup_iframe()
 
     # 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,7 +1,4 @@
 {
     "region": "US",
-    "tests": [
-        "test_demo_ad_verify_new_address_added.py",
-        "test_demo_ad_autofill_dropdown_present_for_email_and_phone.py"
-    ]
+    "tests": []
 }

l10n_CM/region/Unified.json

@@ -1,26 +1,27 @@
 {
   "tests": [
-        "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
-        "test_demo_ad_autofill_name_org.py",
-        "test_demo_ad_autofill_phone_email.py",
-        "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
-        "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
-        "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
-        "test_demo_ad_verify_new_address_added.py",
-        "test_demo_cc_add_new_credit_card.py",
-        "test_demo_cc_clear_form.py",
-        "test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py",
-        "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
-        "test_demo_cc_dropdown_presence.py",
-        "test_demo_cc_autofill_from_dropdown.py",
-        "test_demo_cc_yellow_highlight.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_clear_name_org.py",
-        "test_demo_ad_clear_address_fields.py",
-        "test_demo_ad_clear_tel_email.py"
+    "test_demo_ad_address_data_captured_in_doorhanger_and_stored.py",
+    "test_demo_ad_autofill_name_org.py",
+    "test_demo_ad_autofill_phone_email.py",
+    "test_demo_ad_doorhanger_shown_on_valid_address_submission.py",
+    "test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py",
+    "test_demo_ad_name_org_captured_in_doorhanger_and_stored.py",
+    "test_demo_ad_verify_new_address_added.py",
+    "test_demo_cc_add_new_credit_card.py",
+    "test_demo_cc_clear_form.py",
+    "test_demo_cc_doorhanger_data_is_stored_in_about_prefs.py",
+    "test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py",
+    "test_demo_cc_dropdown_presence.py",
+    "test_demo_cc_autofill_from_dropdown.py",
+    "test_demo_cc_yellow_highlight.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_clear_name_org.py",
+    "test_demo_ad_clear_address_fields.py",
+    "test_demo_ad_clear_tel_email.py",
+    "test_demo_ad_autofill_dropdown_present_for_email_and_phone.py"
   ]
 }

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

@@ -504,6 +504,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_base.py

@@ -703,6 +703,11 @@ def wait_for_num_tabs(self, num_tabs: int) -> Page:
             )
         return self
 
+    def switch_to_default_frame(self) -> Page:
+        """Switch to default content frame"""
+        self.driver.switch_to.default_content()
+        return self
+
     def switch_to_new_tab(self) -> Page:
         """Get list of all window handles, switch to the newly opened tab"""
         with self.driver.context(self.driver.CONTEXT_CONTENT):

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
@@ -597,7 +597,11 @@ def verify_autofill_dropdown_addresses(
         )
 
     def autofill_and_verify(
-        self, address_autofill_popup, field_label, address_autofill_data, util
+        self,
+        address_autofill_popup,
+        field_label,
+        address_autofill_data: AutofillAddressBase,
+        util,
     ):
         """
         Autofills a form field, verifies the data, and clears it if necessary.
@@ -609,13 +613,13 @@ def autofill_and_verify(
             The popup handler for autofill suggestions.
         field_label : str
             The label of the field being autofilled.
-        address_autofill_data : dict
+        address_autofill_data : AutofillAddressBase
             The generated autofill data for verification.
         region : str
             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 [
+        if field_label == "address-level1" and address_autofill_data.country_code in [
             "DE",
             "FR",
         ]:
@@ -628,7 +632,7 @@ def autofill_and_verify(
 
         # Verify autofill data
         self.verify_autofill_data(
-            address_autofill_data, address_autofill_data.country, util
+            address_autofill_data, address_autofill_data.country_code, util
         )
 
         # Clear form autofill
@@ -662,7 +666,10 @@ def verify_all_fields_cleared(self):
             assert not value, f"Field '{field}' is not empty: Found '{value}'"
 
     def clear_and_verify(
-        self, address_autofill_popup, field_label, address_autofill_data
+        self,
+        address_autofill_popup,
+        field_label,
+        address_autofill_data: AutofillAddressBase,
     ):
         """
         Autofills a form field, clears it, and verifies that it is empty.
@@ -680,7 +687,7 @@ def clear_and_verify(
             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 [
+        if field_label == "address-level1" and address_autofill_data.country_code in [
             "DE",
             "FR",
         ]: