reworked create_address_profile to fix error

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,7 +56,7 @@ 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)
 

l10n_CM/Unified/test_demo_ad_autofill_dropdown_present_for_email_and_phone.py

@@ -11,12 +11,17 @@ def test_case():
     return "2888567"
 
 
+@pytest.fixture()
+def region():
+    return "CA"
+
+
 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

@@ -33,8 +33,9 @@ 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)
-    driver.switch_to.frame(1)
+    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

l10n_CM/region/US.json

@@ -1,4 +1,4 @@
 {
     "region": "US",
-    "tests": ["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/page_base.py

@@ -679,6 +679,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

@@ -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",
         ]:

modules/page_object_prefs.py

@@ -144,24 +144,24 @@ def organize_data_into_obj(self, observed_text: List[str]) -> AutofillAddressBas
         address_level_2 = observed_text[2]
         organization = observed_text[3]
         address_level_1 = observed_text[4]
-        country = observed_text[5]
+        country_code = observed_text[5]
         postal_code = observed_text[6]
         telephone = observed_text[7]
         email = observed_text[8]
 
         return AutofillAddressBase(
-            name,
-            organization,
-            address,
-            address_level_2,
-            address_level_1,
-            postal_code,
-            country,
-            email,
-            telephone,
+            name=name,
+            organization=organization,
+            street_address=address,
+            address_level_2=address_level_2,
+            address_level_1=address_level_1,
+            postal_code=postal_code,
+            country_code=country_code,
+            email=email,
+            telephone=telephone,
         )
 
-    def fill_autofill_panel_information(
+    def fill_and_save_autofill_panel_information(
         self, autofill_info: AutofillAddressBase
     ) -> BasePage:
         """
@@ -269,16 +269,30 @@ def get_saved_addresses_popup_iframe(self) -> WebElement:
         """
         Returns the iframe object for the dialog panel in the popup
         """
-        self.get_element("prefs-button", labels=["Saved addresses"]).click()
+        self.get_saved_addresses_popup().click()
         iframe = self.get_element("browser-popup")
         return iframe
 
+    def get_saved_addresses_popup(self) -> WebElement:
+        """
+        Returns saved addresses button element
+        """
+        return self.get_element("prefs-button", labels=["Saved addresses"])
+
     def switch_to_saved_addresses_popup_iframe(self) -> BasePage:
         """
         switch to save addresses popup frame.
         """
-        save_addresses = self.get_saved_addresses_popup_iframe()
-        self.driver.switch_to.frame(save_addresses)
+        self.switch_to_default_frame()
+        self.driver.switch_to.frame(1)
+        return self
+
+    def switch_to_edit_saved_addresses_popup_iframe(self) -> BasePage:
+        """
+        Switch to form iframe to edit saved addresses.
+        """
+        self.switch_to_default_frame()
+        self.driver.switch_to.frame(2)
         return self
 
     def add_entry_to_saved_addresses(self, address_data: AutofillAddressBase):
@@ -290,10 +304,9 @@ def add_entry_to_saved_addresses(self, address_data: AutofillAddressBase):
         """
         self.switch_to_saved_addresses_popup_iframe()
         self.get_element("add-address").click()
-        self.driver.switch_to.default_content()
-        self.driver.switch_to.frame(2)
-        self.fill_autofill_panel_information(address_data)
-        self.driver.switch_to.default_content()
+        self.switch_to_edit_saved_addresses_popup_iframe()
+        self.fill_and_save_autofill_panel_information(address_data)
+        self.switch_to_default_frame()
         return self
 
     def get_password_exceptions_popup_iframe(self) -> WebElement:

tests/form_autofill/test_create_profile_autofill.py

@@ -33,7 +33,8 @@ def test_create_address_profile(driver: Firefox):
     ).click()
 
     # fill in the data and clean it up
-    about_prefs_obj.fill_autofill_panel_information(autofill_sample_data)
+    about_prefs_obj.add_entry_to_saved_addresses(autofill_sample_data)
+    about_prefs_obj.switch_to_saved_addresses_popup_iframe()
     saved_address_option = about_prefs_obj.get_element("saved-addresses")
     inner_content = saved_address_option.get_attribute("innerHTML")
     cleaned_data = about_prefs_obj.extract_content_from_html(inner_content)
@@ -47,6 +48,7 @@ def test_create_address_profile(driver: Firefox):
 
     # currently ignoring the address level 1 field
     observed_data.telephone = util.normalize_phone_number(observed_data.telephone)
+    observed_data.country = autofill_sample_data.country
     observed_data.address_level_1 = autofill_sample_data.address_level_1
 
     # ensure that the objects have the same fields