Merge pull request #472 from mozilla/philimon/add-new-address

Philimon/Create test for Verify that a new Address can be added

Author: Tracy-Walker

l10n_CM/Unified/conftest.py

@@ -1,7 +1,13 @@
 import os
+from typing import List
 
 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():
@@ -10,17 +16,47 @@ def region():
 
 @pytest.fixture()
 def add_prefs(region: str):
-    return [
+    return []
+
+
+@pytest.fixture()
+def set_prefs(add_prefs: List[tuple[str, str | bool]], region: str):
+    """Set prefs"""
+    prefs = [
         ("extensions.formautofill.creditCards.reauth.optout", False),
         ("extensions.formautofill.reauth.enabled", False),
         ("browser.aboutConfig.showWarning", False),
         ("browser.search.region", region),
     ]
+    prefs.extend(add_prefs)
+    return prefs
 
 
 @pytest.fixture()
-def set_prefs(add_prefs: dict):
-    """Set prefs"""
-    prefs = []
-    prefs.extend(add_prefs)
-    return prefs
+def address_autofill(driver):
+    yield AddressFill(driver)
+
+
+@pytest.fixture()
+def autofill_popup(driver):
+    yield AutofillPopup(driver)
+
+
+@pytest.fixture()
+def util():
+    yield Utilities()
+
+
+@pytest.fixture()
+def about_prefs_privacy(driver):
+    yield AboutPrefs(driver, category="privacy")
+
+
+@pytest.fixture()
+def about_prefs(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,7 +4,7 @@
 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 BrowserActions, Utilities
+from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -13,41 +13,36 @@ def test_case():
 
 
 def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
-    driver: Firefox, region: str
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
+    about_prefs_privacy: 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)
     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
@@ -56,24 +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 = AboutPrefs(driver, category="privacy").open()
-    iframe = about_prefs.get_save_addresses_popup_iframe()
-    browser_action_obj.switch_to_iframe_context(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

@@ -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,25 +12,19 @@ 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,
+    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
     """
-
-    # 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)
     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

@@ -4,7 +4,7 @@
 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 BrowserActions, Utilities
+from modules.util import Utilities
 
 
 @pytest.fixture()
@@ -13,53 +13,58 @@ def test_case():
 
 
 def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
-    driver: Firefox, region: str
+    driver: Firefox,
+    region: str,
+    address_autofill: AddressFill,
+    util: Utilities,
+    autofill_popup: AutofillPopup,
+    about_prefs_privacy: AboutPrefs,
 ):
     """
     C2888704 - Verify tele/email 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)
     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 = AboutPrefs(driver, category="privacy").open()
-    iframe = about_prefs.get_save_addresses_popup_iframe()
-    browser_action_obj.switch_to_iframe_context(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 = about_prefs.get_elements("saved-addresses-values")
-    expected_values = [expected_phone, expected_email]
-    found_email_phone = any(
-        all(value in element.text for value in expected_values) for element in elements
+    elements = map(
+        data_sanitizer,
+        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))
     assert found_email_phone, (
         "Email or phone were not found in any of the address entries!"
     )
+
+
+def data_sanitizer(value: str):
+    value = value.strip()
+    if value[0] == "+":
+        return value[1:]
+    return value

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,47 +13,41 @@ 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,
+    autofill_popup: AutofillPopup,
+    about_prefs_privacy: AboutPrefs,
 ):
     """
     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)
     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 = AboutPrefs(driver, category="privacy").open()
-    iframe = about_prefs.get_save_addresses_popup_iframe()
-    browser_action_obj.switch_to_iframe_context(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