rename and minor change to about_prefs naming

Author: philimon-reset

l10n_CM/Unified/conftest.py

@@ -38,7 +38,7 @@ def address_autofill(driver):
 
 
 @pytest.fixture()
-def address_autofill_popup(driver):
+def autofill_popup(driver):
     yield AutofillPopup(driver)
 
 
@@ -48,12 +48,12 @@ def util():
 
 
 @pytest.fixture()
-def about_prefs(driver):
+def about_prefs_privacy(driver):
     yield AboutPrefs(driver, category="privacy")
 
 
 @pytest.fixture()
-def about_prefs_cc_popup(driver):
+def about_prefs(driver):
     yield AboutPrefs(driver)
 
 

l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py

@@ -17,8 +17,8 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
     region: str,
     address_autofill: AddressFill,
     util: Utilities,
-    address_autofill_popup: AutofillPopup,
-    about_prefs: AboutPrefs,
+    autofill_popup: AutofillPopup,
+    about_prefs_privacy: AboutPrefs,
 ):
     """
     C2888703 - Verify Address data are captured in the Capture Doorhanger and stored in about:preferences
@@ -29,24 +29,20 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
     address_autofill.save_information_basic(address_autofill_data)
 
     # The "Save address?" doorhanger is displayed
-    address_autofill_popup.element_visible("address-save-doorhanger")
+    autofill_popup.element_visible("address-save-doorhanger")
 
     # containing Street Address field
     expected_street_add = address_autofill_data.street_address
-    address_autofill_popup.element_has_text(
-        "address-doorhanger-street", expected_street_add
-    )
+    autofill_popup.element_has_text("address-doorhanger-street", expected_street_add)
 
     # containing City field
     expected_city = address_autofill_data.address_level_2
-    address_autofill_popup.element_has_text("address-doorhanger-city", expected_city)
+    autofill_popup.element_has_text("address-doorhanger-city", expected_city)
 
     expected_state = address_autofill_data.address_level_1
     if region not in ["FR", "DE"]:
         state_abbreviation = util.get_state_province_abbreviation(expected_state)
-        address_autofill_popup.element_has_text(
-            "address-doorhanger-state", state_abbreviation
-        )
+        autofill_popup.element_has_text("address-doorhanger-state", state_abbreviation)
 
     # Verify Zip Code field (Different selector for DE/FR)
     expected_zip = address_autofill_data.postal_code
@@ -55,23 +51,21 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
         if region in ["FR", "DE"]
         else "address-doorhanger-zip"
     )
-    address_autofill_popup.element_has_text(zip_selector, expected_zip)
+    autofill_popup.element_has_text(zip_selector, expected_zip)
 
     # containing Country field
     expected_country = address_autofill_data.country
-    address_autofill_popup.element_has_text(
-        "address-doorhanger-country", expected_country
-    )
+    autofill_popup.element_has_text("address-doorhanger-country", expected_country)
 
     # Click the "Save" button
-    address_autofill_popup.click_doorhanger_button("save")
+    autofill_popup.click_doorhanger_button("save")
 
     # Navigate to about:preferences#privacy => "Autofill" section
-    about_prefs.open()
-    about_prefs.switch_to_saved_addresses_popup_iframe()
+    about_prefs_privacy.open()
+    about_prefs_privacy.switch_to_saved_addresses_popup_iframe()
 
     # Verify saved addresses
-    elements = about_prefs.get_elements("saved-addresses-values")
+    elements = about_prefs_privacy.get_elements("saved-addresses-values")
 
     # Expected values for verification
     expected_values = [

l10n_CM/Unified/test_demo_ad_doorhanger_shown_on_valid_address_submission.py

@@ -16,15 +16,15 @@ def test_address_doorhanger_displayed_after_entering_valid_address(
     region: str,
     address_autofill: AddressFill,
     util: Utilities,
-    address_autofill_popup: AutofillPopup,
+    autofill_popup: AutofillPopup,
 ):
     """
-    C2886581 - Verify the Capture Doorhanger is displayed after entering valid Address data
+    C2886581 - Verify the Capture Door hanger is displayed after entering valid Address data
     """
     # Create fake data and fill it in
     address_autofill.open()
     address_autofill_data = util.fake_autofill_data(region)
     address_autofill.save_information_basic(address_autofill_data)
 
-    # Check "Save Address?" doorhanger appears in the Address bar
-    address_autofill_popup.element_visible("address-save-doorhanger")
+    # Check "Save Address?" door hanger appears in the Address bar
+    autofill_popup.element_visible("address-save-doorhanger")

l10n_CM/Unified/test_demo_ad_email_phone_captured_in_doorhanger_and_stored.py

@@ -17,8 +17,8 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
     region: str,
     address_autofill: AddressFill,
     util: Utilities,
-    address_autofill_popup: AutofillPopup,
-    about_prefs: AboutPrefs,
+    autofill_popup: AutofillPopup,
+    about_prefs_privacy: AboutPrefs,
 ):
     """
     C2888704 - Verify tele/email data are captured in the Capture Doorhanger and stored in about:preferences
@@ -30,33 +30,31 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
     address_autofill.save_information_basic(address_autofill_data)
 
     # The "Save address?" doorhanger is displayed
-    address_autofill_popup.element_visible("address-save-doorhanger")
+    autofill_popup.element_visible("address-save-doorhanger")
 
     # containing email field
     expected_email = address_autofill_data.email
-    address_autofill_popup.element_has_text("address-doorhanger-email", expected_email)
+    autofill_popup.element_has_text("address-doorhanger-email", expected_email)
 
     # containing phone field
     expected_phone = address_autofill_data.telephone
     with driver.context(driver.CONTEXT_CHROME):
-        actual_phone = address_autofill_popup.get_element(
-            "address-doorhanger-phone"
-        ).text
+        actual_phone = autofill_popup.get_element("address-doorhanger-phone").text
     normalize_expected = util.normalize_phone_number(expected_phone)
     normalized_actual = util.normalize_phone_number(actual_phone)
     assert normalized_actual == normalize_expected
 
     # Click the "Save" button
-    address_autofill_popup.click_doorhanger_button("save")
+    autofill_popup.click_doorhanger_button("save")
 
     # Navigate to about:preferences#privacy => "Autofill" section
-    about_prefs.open()
-    about_prefs.switch_to_saved_addresses_popup_iframe()
+    about_prefs_privacy.open()
+    about_prefs_privacy.switch_to_saved_addresses_popup_iframe()
 
     # The address saved in step 2 is listed in the "Saved addresses" modal: Email and phone
     elements = map(
         data_sanitizer,
-        about_prefs.get_element("saved-addresses-values").text.split(","),
+        about_prefs_privacy.get_element("saved-addresses-values").text.split(","),
     )
     expected_values = [expected_phone, expected_email]
     found_email_phone = list(set(elements) & set(expected_values))

l10n_CM/Unified/test_demo_ad_name_org_captured_in_doorhanger_and_stored.py

@@ -17,8 +17,8 @@ def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
     region: str,
     address_autofill: AddressFill,
     util: Utilities,
-    address_autofill_popup: AutofillPopup,
-    about_prefs: AboutPrefs,
+    autofill_popup: AutofillPopup,
+    about_prefs_privacy: AboutPrefs,
 ):
     """
     C2888701 - Verify name/org fields are captured in the Capture Doorhanger and stored in about:preferences
@@ -29,25 +29,25 @@ def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
     address_autofill.save_information_basic(address_autofill_data)
 
     # The "Save address?" doorhanger is displayed
-    address_autofill_popup.element_visible("address-save-doorhanger")
+    autofill_popup.element_visible("address-save-doorhanger")
 
     # containing name field
     expected_name = address_autofill_data.name
-    address_autofill_popup.element_has_text("address-doorhanger-name", expected_name)
+    autofill_popup.element_has_text("address-doorhanger-name", expected_name)
 
     # containing org field
     expected_org = address_autofill_data.organization
-    address_autofill_popup.element_has_text("address-doorhanger-org", expected_org)
+    autofill_popup.element_has_text("address-doorhanger-org", expected_org)
 
     # Click the "Save" button
-    address_autofill_popup.click_doorhanger_button("save")
+    autofill_popup.click_doorhanger_button("save")
 
     # Navigate to about:preferences#privacy => "Autofill" section
-    about_prefs.open()
-    about_prefs.switch_to_saved_addresses_popup_iframe()
+    about_prefs_privacy.open()
+    about_prefs_privacy.switch_to_saved_addresses_popup_iframe()
 
     # The address saved in step 2 is listed in the "Saved addresses" modal: name and organization
-    elements = about_prefs.get_elements("saved-addresses-values")
+    elements = about_prefs_privacy.get_elements("saved-addresses-values")
     expected_values = [expected_name, expected_org]
     found_name_org = any(
         all(value in element.text for value in expected_values) for element in elements

l10n_CM/Unified/test_us_demo_addy_verify_new_address_added.py renamed to l10n_CM/Unified/test_demo_addy_verify_new_address_added.py

@@ -27,7 +27,7 @@ def add_prefs(region: str):
 
 
 def test_verify_new_address_is_added(
-    driver: Firefox, region: str, about_prefs: AboutPrefs, util: Utilities
+    driver: Firefox, region: str, about_prefs_privacy: AboutPrefs, util: Utilities
 ):
     """
     C2886580: Verify that a new Address can be added
@@ -38,12 +38,12 @@ def test_verify_new_address_is_added(
     address_autofill_data = util.fake_autofill_data(region)
 
     # open saved addresses and add entry
-    about_prefs.open()
-    about_prefs.add_entry_to_saved_addresses(address_autofill_data)
+    about_prefs_privacy.open()
+    about_prefs_privacy.add_entry_to_saved_addresses(address_autofill_data)
 
     # 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.get_element("saved-addresses-values").text.split(",")
+    elements = about_prefs_privacy.get_element("saved-addresses-values").text.split(",")
     address_match = all(
         data_sanitizer(element, region, inverted_state_province_abbr)
         in address_autofill_data.__dict__.values()

l10n_CM/Unified/test_demo_cc_add_new_credit_card.py

@@ -16,29 +16,27 @@ def test_create_new_cc_profile(
     driver: Firefox,
     region: str,
     util: Utilities,
+    about_prefs_privacy: AboutPrefs,
     about_prefs: AboutPrefs,
-    about_prefs_cc_popup: AboutPrefs,
 ):
     """
     C2886595 - Tests you can create and save a new Credit Card profile
     """
 
     # Go to about:preferences#privacy and open Saved Payment Methods
-    about_prefs.open()
-    about_prefs.switch_to_saved_payments_popup_iframe()
+    about_prefs_privacy.open()
+    about_prefs_privacy.switch_to_saved_payments_popup_iframe()
 
     # Save CC information using fake data
     credit_card_sample_data = util.fake_credit_card_data()
 
     # Add a new CC profile
-    about_prefs_cc_popup.click_on(
-        "panel-popup-button", labels=["autofill-manage-add-button"]
-    )
-    about_prefs.fill_cc_panel_information(credit_card_sample_data)
+    about_prefs.click_on("panel-popup-button", labels=["autofill-manage-add-button"])
+    about_prefs_privacy.fill_cc_panel_information(credit_card_sample_data)
 
     # Get the saved CC data
-    cc_profiles = about_prefs_cc_popup.get_all_saved_cc_profiles()
+    cc_profiles = about_prefs.get_all_saved_cc_profiles()
     cc_info_json = json.loads(cc_profiles[0].get_dom_attribute("data-l10n-args"))
 
     # Compare input CC data with saved CC data
-    about_prefs.verify_cc_json(cc_info_json, credit_card_sample_data)
+    about_prefs_privacy.verify_cc_json(cc_info_json, credit_card_sample_data)

l10n_CM/Unified/test_demo_cc_clear_form.py

@@ -14,9 +14,9 @@ def test_case():
 def test_cc_clear_form(
     driver: Firefox,
     util: Utilities,
-    address_autofill_popup: AutofillPopup,
+    autofill_popup: AutofillPopup,
+    about_prefs_privacy: AboutPrefs,
     about_prefs: AboutPrefs,
-    about_prefs_cc_popup: AboutPrefs,
     credit_card_fill_obj: CreditCardFill,
 ):
     """
@@ -25,15 +25,13 @@ def test_cc_clear_form(
     """
 
     # Save a credit card in about:preferences
-    about_prefs.open()
-    about_prefs.switch_to_saved_payments_popup_iframe()
+    about_prefs_privacy.open()
+    about_prefs_privacy.switch_to_saved_payments_popup_iframe()
 
     credit_card_sample_data = util.fake_credit_card_data()
-    about_prefs_cc_popup.click_on(
-        "panel-popup-button", labels=["autofill-manage-add-button"]
-    )
-    about_prefs.fill_cc_panel_information(credit_card_sample_data)
+    about_prefs.click_on("panel-popup-button", labels=["autofill-manage-add-button"])
+    about_prefs_privacy.fill_cc_panel_information(credit_card_sample_data)
 
     # Open credit card form page, clear form and verify all fields are empty
     credit_card_fill_obj.open()
-    credit_card_fill_obj.verify_clear_form_all_fields(address_autofill_popup)
+    credit_card_fill_obj.verify_clear_form_all_fields(autofill_popup)

l10n_CM/Unified/test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py

@@ -15,7 +15,7 @@ def test_cc_check_door_hanger_is_displayed(
     driver: Firefox,
     region: str,
     util: Utilities,
-    address_autofill_popup: AutofillPopup,
+    autofill_popup: AutofillPopup,
     credit_card_fill_obj: CreditCardFill,
 ):
     """
@@ -29,4 +29,4 @@ def test_cc_check_door_hanger_is_displayed(
     credit_card_fill_obj.fill_credit_card_info(credit_card_sample_data)
 
     # Check if an element from the door hanger is visible
-    address_autofill_popup.element_visible("doorhanger-save-button")
+    autofill_popup.element_visible("doorhanger-save-button")

l10n_CM/Unified/test_demo_cc_dropdown-presence.py

@@ -14,27 +14,25 @@ def test_case():
 def test_dropdown_presence_credit_card(
     driver: Firefox,
     util: Utilities,
-    address_autofill_popup: AutofillPopup,
+    autofill_popup: AutofillPopup,
+    about_prefs_privacy: AboutPrefs,
     about_prefs: AboutPrefs,
-    about_prefs_cc_popup: AboutPrefs,
     credit_card_fill_obj: CreditCardFill,
 ):
     """
     C2886598 - Verify autofill dropdown is displayed only for the eligible fields after a credit card is saved
     """
 
     # Save a credit card in about:preferences
-    about_prefs.open()
-    about_prefs.switch_to_saved_payments_popup_iframe()
+    about_prefs_privacy.open()
+    about_prefs_privacy.switch_to_saved_payments_popup_iframe()
 
     credit_card_sample_data = util.fake_credit_card_data()
-    about_prefs_cc_popup.click_on(
-        "panel-popup-button", labels=["autofill-manage-add-button"]
-    )
-    about_prefs.fill_cc_panel_information(credit_card_sample_data)
+    about_prefs.click_on("panel-popup-button", labels=["autofill-manage-add-button"])
+    about_prefs_privacy.fill_cc_panel_information(credit_card_sample_data)
 
     # Open credit card form page
     credit_card_fill_obj.open()
 
     # Verify autofill dropdown is displayed only for the eligible fields
-    credit_card_fill_obj.verify_autofill_dropdown_all_fields(address_autofill_popup)
+    credit_card_fill_obj.verify_autofill_dropdown_all_fields(autofill_popup)