minor changes to l10n tests and added new test to verify saved addresses

Author: philimon-reset

l10n_CM/Unified/conftest.py

@@ -2,6 +2,11 @@
 
 import pytest
 
+from modules.browser_object_autofill_popup import AutofillPopup
+from modules.page_object_autofill import AddressFill, CreditCardFill
+from modules.page_object_prefs import AboutPrefs
+from modules.util import Utilities
+
 
 @pytest.fixture()
 def region():
@@ -19,8 +24,38 @@ def add_prefs(region: str):
 
 
 @pytest.fixture()
-def set_prefs(add_prefs: dict):
+def set_prefs(add_prefs: dict, region: str):
     """Set prefs"""
     prefs = []
     prefs.extend(add_prefs)
     return prefs
+
+
+@pytest.fixture()
+def address_autofill(driver):
+    yield AddressFill(driver)
+
+
+@pytest.fixture()
+def address_autofill_popup(driver):
+    yield AutofillPopup(driver)
+
+
+@pytest.fixture()
+def util():
+    yield Utilities()
+
+
+@pytest.fixture()
+def about_prefs(driver):
+    yield AboutPrefs(driver, category="privacy")
+
+
+@pytest.fixture()
+def about_prefs_cc_popup(driver):
+    yield AboutPrefs(driver)
+
+
+@pytest.fixture()
+def credit_card_fill_obj(driver):
+    yield CreditCardFill(driver)

l10n_CM/Unified/test_demo_ad_address_data_captured_in_doorhanger_and_stored.py

@@ -4,25 +4,25 @@
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object_autofill import AddressFill
 from modules.page_object_prefs import AboutPrefs
-from modules.util import Utilities, BrowserActions
-
+from modules.util import Utilities
 
 
 @pytest.fixture()
 def test_case():
     return "2888703"
 
 
-def test_demo_ad_address_data_captured_in_doorhanger_and_stored(driver: Firefox, region: str):
+def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    address_autofill_popup: AutofillPopup,
+    about_prefs: AboutPrefs,
+):
     """
     C2888703 - Verify Address data are captured in the Capture Doorhanger and stored in about:preferences
     """
-    # instantiate objects
-    address_autofill = AddressFill(driver)
-    address_autofill_popup = AutofillPopup(driver)
-    util = Utilities()
-    browser_action_obj = BrowserActions(driver)
-
     # create fake data and fill it in
     address_autofill.open()
     address_autofill_data = util.fake_autofill_data(region)
@@ -33,7 +33,9 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(driver: Firefox,
 
     # containing Street Address field
     expected_street_add = address_autofill_data.street_address
-    address_autofill_popup.element_has_text("address-doorhanger-street", expected_street_add)
+    address_autofill_popup.element_has_text(
+        "address-doorhanger-street", expected_street_add
+    )
 
     # containing City field
     expected_city = address_autofill_data.address_level_2
@@ -42,36 +44,47 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(driver: Firefox,
     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)
+        address_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
-    zip_selector = "address-doorhanger-zip-other" if region in ["FR", "DE"] else "address-doorhanger-zip"
+    zip_selector = (
+        "address-doorhanger-zip-other"
+        if region in ["FR", "DE"]
+        else "address-doorhanger-zip"
+    )
     address_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)
+    address_autofill_popup.element_has_text(
+        "address-doorhanger-country", expected_country
+    )
 
     # Click the "Save" button
     address_autofill_popup.click_doorhanger_button("save")
 
     # Navigate to about:preferences#privacy => "Autofill" section
-    about_prefs = AboutPrefs(driver, category="privacy").open()
-    iframe = about_prefs.get_save_addresses_popup_iframe()
-    browser_action_obj.switch_to_iframe_context(iframe)
+    about_prefs.open()
+    about_prefs.switch_to_saved_addresses_popup_iframe()
 
     # Verify saved addresses
     elements = about_prefs.get_elements("saved-addresses-values")
 
     # Expected values for verification
-    expected_values = [expected_street_add, expected_city, expected_zip, expected_country]
+    expected_values = [
+        expected_street_add,
+        expected_city,
+        expected_zip,
+        expected_country,
+    ]
     if region not in ["FR", "DE"]:
         expected_values.insert(2, expected_state)
 
     # Check if all expected values exist in any saved address
     found_address_data = any(
-        all(value in element.text for value in expected_values)
-        for element in elements
+        all(value in element.text for value in expected_values) for element in elements
     )
-    assert found_address_data, "Street, city, state (if applicable), zip, or country were not found in any of the address entries!"
+    assert found_address_data, "Street, city, state (if applicable), zip, or country were not found in any of the address entries!"

l10n_CM/Unified/test_demo_ad_doorhanger_shown_on_valid_address_submission.py

@@ -2,7 +2,6 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object_autofill_popup import AutofillPopup
-from modules.page_object import AboutConfig
 from modules.page_object_autofill import AddressFill
 from modules.util import Utilities
 
@@ -13,21 +12,15 @@ def test_case():
 
 
 def test_address_doorhanger_displayed_after_entering_valid_address(
-    driver: Firefox, region: str
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    address_autofill_popup: AutofillPopup,
 ):
     """
     C2886581 - Verify the Capture Doorhanger is displayed after entering valid Address data
     """
-
-    # Instantiate objects
-    address_autofill = AddressFill(driver)
-    address_autofill_popup = AutofillPopup(driver)
-    util = Utilities()
-    about_config = AboutConfig(driver)
-
-    # Change pref value of region
-    about_config.change_config_value("browser.search.region", region)
-
     # Create fake data and fill it in
     address_autofill.open()
     address_autofill_data = util.fake_autofill_data(region)

l10n_CM/Unified/test_demo_ad_name_org_captured_in_doorhanger_and_stored.py

@@ -2,10 +2,9 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object_autofill_popup import AutofillPopup
-from modules.page_object_about_pages import AboutConfig
 from modules.page_object_autofill import AddressFill
 from modules.page_object_prefs import AboutPrefs
-from modules.util import BrowserActions, Utilities
+from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -14,21 +13,15 @@ def test_case():
 
 
 def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
-    driver: Firefox, region: str
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    address_autofill_popup: AutofillPopup,
 ):
     """
     C2888701 - Verify name/org fields are captured in the Capture Doorhanger and stored in about:preferences
     """
-    # instantiate objects
-    address_autofill = AddressFill(driver)
-    address_autofill_popup = AutofillPopup(driver)
-    util = Utilities()
-    about_config = AboutConfig(driver)
-    browser_action_obj = BrowserActions(driver)
-
-    # Change pref value of region
-    about_config.change_config_value("browser.search.region", region)
-
     # create fake data and fill it in
     address_autofill.open()
     address_autofill_data = util.fake_autofill_data(region)
@@ -50,8 +43,7 @@ def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
 
     # Navigate to about:preferences#privacy => "Autofill" section
     about_prefs = AboutPrefs(driver, category="privacy").open()
-    iframe = about_prefs.get_save_addresses_popup_iframe()
-    browser_action_obj.switch_to_iframe_context(iframe)
+    about_prefs.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")

l10n_CM/Unified/test_demo_cc_add_new_credit_card.py

@@ -3,34 +3,29 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.page_object import AboutConfig, AboutPrefs
-from modules.util import BrowserActions, Utilities
+from modules.page_object import AboutPrefs
+from modules.util import Utilities
 
 
 @pytest.fixture()
 def test_case():
     return "2886595"
 
 
-def test_create_new_cc_profile(driver: Firefox, region: str):
+def test_create_new_cc_profile(
+    driver: Firefox,
+    region: str,
+    util: Utilities,
+    about_prefs: AboutPrefs,
+    about_prefs_cc_popup: AboutPrefs,
+):
     """
     C2886595 - Tests you can create and save a new Credit Card profile
     """
 
-    # Instantiate objects
-    util = Utilities()
-    browser_action_obj = BrowserActions(driver)
-    about_prefs = AboutPrefs(driver, category="privacy")
-    about_prefs_cc_popup = AboutPrefs(driver)
-    about_config = AboutConfig(driver)
-
-    # Change pref value of region
-    about_config.change_config_value("browser.search.region", region)
-
     # Go to about:preferences#privacy and open Saved Payment Methods
     about_prefs.open()
-    iframe = about_prefs.get_saved_payments_popup_iframe()
-    browser_action_obj.switch_to_iframe_context(iframe)
+    about_prefs.switch_to_saved_payments_popup_iframe()
 
     # Save CC information using fake data
     credit_card_sample_data = util.fake_credit_card_data()

l10n_CM/Unified/test_demo_cc_doorhanger_shown_on_valid_credit_card_submission.py

@@ -2,7 +2,6 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object_autofill_popup import AutofillPopup
-from modules.page_object import AboutConfig
 from modules.page_object_autofill import CreditCardFill
 from modules.util import Utilities
 
@@ -12,20 +11,16 @@ def test_case():
     return "2889441"
 
 
-def test_cc_check_door_hanger_is_displayed(driver: Firefox, region: str):
+def test_cc_check_door_hanger_is_displayed(
+    driver: Firefox,
+    region: str,
+    util: Utilities,
+    address_autofill_popup: AutofillPopup,
+    credit_card_fill_obj: CreditCardFill,
+):
     """
     C2889441 - Ensures that the door hanger is displayed after filling credit card info
     """
-
-    # Instantiate objects
-    autofill_popup_obj = AutofillPopup(driver)
-    credit_card_fill_obj = CreditCardFill(driver)
-    util = Utilities()
-    about_config = AboutConfig(driver)
-
-    # Change pref value of region
-    about_config.change_config_value("browser.search.region", region)
-
     # Navigate to page
     credit_card_fill_obj.open()
 
@@ -34,4 +29,4 @@ def test_cc_check_door_hanger_is_displayed(driver: Firefox, region: str):
     credit_card_fill_obj.fill_credit_card_info(credit_card_sample_data)
 
     # Check if an element from the door hanger is visible
-    autofill_popup_obj.element_visible("doorhanger-save-button")
+    address_autofill_popup.element_visible("doorhanger-save-button")

l10n_CM/Unified/test_demo_cc_dropdown-presence.py

@@ -3,31 +3,30 @@
 
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object import AboutPrefs, CreditCardFill
-from modules.util import BrowserActions, Utilities
+from modules.util import Utilities
 
 
 @pytest.fixture()
 def test_case():
     return "2886598"
 
 
-def test_dropdown_presence_credit_card(driver: Firefox):
+def test_dropdown_presence_credit_card(
+    driver: Firefox,
+    util: Utilities,
+    address_autofill_popup: AutofillPopup,
+    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
     """
 
-    # Initialize objects
-    util = Utilities()
-    about_prefs = AboutPrefs(driver, category="privacy")
-    about_prefs_cc_popup = AboutPrefs(driver)
-    browser_action_obj = BrowserActions(driver)
-    credit_card_fill_obj = CreditCardFill(driver)
-    autofill_popup_obj = AutofillPopup(driver)
-
     # Save a credit card in about:preferences
     about_prefs.open()
-    iframe = about_prefs.get_saved_payments_popup_iframe()
-    browser_action_obj.switch_to_iframe_context(iframe)
+    about_prefs.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"]
@@ -38,4 +37,4 @@ def test_dropdown_presence_credit_card(driver: Firefox):
     credit_card_fill_obj.open()
 
     # Verify autofill dropdown is displayed only for the eligible fields
-    credit_card_fill_obj.verify_autofill_dropdown_all_fields(autofill_popup_obj)
+    credit_card_fill_obj.verify_autofill_dropdown_all_fields(address_autofill_popup)