broken change to ignore doorhanger

Author: philimon-reset

SELECTOR_INFO.md

@@ -571,13 +571,6 @@ Location: about:preferences#privacy popup dialog
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
-Selector Name: dialog-close-button
-Selector Data: "dialogClose"
-Description: The close button of the popup dialog
-Location: top right corner of about:preferences popup dialog
-Path to .json: modules/data/about_prefs.components.json
-```
-```
 Selector Name: saved-addresses
 Selector Data: "addresses"
 Description: The element that contains the saved addresses
@@ -1368,14 +1361,7 @@ Location: Inside any autofill-eligible form field, triggered by user interaction
 Path to .json: modules/data/autofill_popup.components.json
 ```
 ```
-Selector Name: address-preview-form-container
-Selector Data: "address-save-update-notification-content"
-Description: Form container that is hidden in chrome context. Used to verify hover preview data
-Location: Inside chrome context, holds the data that would be showed as a preview when autofill is hovered.
-Path to .json: modules/data/autofill_popup.components.json
-```
-```
-Selector Name: cc-preview-form-container
+Selector Name: preview-form-container
 Selector Data: ".autocomplete-richlistbox richlistitem"
 Description: Form container that is hidden in chrome context. Used to verify hover preview data
 Location: Inside chrome context, holds the data that would be showed as a preview when autofill is hovered.

l10n_CM/Unified/conftest.py

@@ -18,6 +18,24 @@ def region():
     return os.environ.get("FX_REGION", "US")
 
 
+@pytest.fixture()
+def add_to_prefs_list(region: str):
+    return []
+
+
+@pytest.fixture()
+def prefs_list(add_to_prefs_list: List[tuple[str, str | bool]], region: str):
+    """List of prefs to send to main conftest.py driver fixture"""
+    prefs = [
+        ("extensions.formautofill.creditCards.reauth.optout", False),
+        ("extensions.formautofill.reauth.enabled", False),
+        ("browser.aboutConfig.showWarning", False),
+        ("browser.search.region", region),
+    ]
+    prefs.extend(add_to_prefs_list)
+    return prefs
+
+
 @pytest.fixture()
 def site_data():
     live_site = os.environ.get("FX_SITE", None)
@@ -47,66 +65,98 @@ def field_mapping(site_data):
 
 
 @pytest.fixture()
-def submit_button(site_data):
-    submit = site_data.get("submit_button", None)
-    return (
-        {"submit-button": {"selectorData": submit, "strategy": "css", "groups": []}}
-        if submit
-        else {}
+def address_autofill(driver, url_template, fields, field_mapping):
+    return AddressFill(
+        driver, url_template=url_template, field_mapping=field_mapping, fields=fields
     )
 
 
 @pytest.fixture()
-def add_to_prefs_list(region: str):
-    return []
+def credit_card_autofill(driver, url_template, fields, field_mapping):
+    return CreditCardFill(
+        driver, url_template=url_template, field_mapping=field_mapping, fields=fields
+    )
 
 
 @pytest.fixture()
-def prefs_list(add_to_prefs_list: List[tuple[str, str | bool]], region: str):
-    """List of prefs to send to main conftest.py driver fixture"""
-    prefs = [
-        ("extensions.formautofill.creditCards.reauth.optout", False),
-        ("extensions.formautofill.reauth.enabled", False),
-        ("browser.aboutConfig.showWarning", False),
-        ("browser.search.region", region),
-    ]
-    prefs.extend(add_to_prefs_list)
-    return prefs
+def autofill_popup(driver):
+    return AutofillPopup(driver)
 
 
 @pytest.fixture()
-def address_autofill(driver, url_template, fields, field_mapping, submit_button):
-    af = AddressFill(
-        driver, url_template=url_template, field_mapping=field_mapping, fields=fields
-    )
-    af.elements |= submit_button
-    yield af
+def util():
+    return Utilities()
 
 
 @pytest.fixture()
-def credit_card_autofill(driver, url_template, fields, field_mapping, submit_button):
-    cf = CreditCardFill(
-        driver, url_template=url_template, field_mapping=field_mapping, fields=fields
-    )
-    cf.elements |= submit_button
-    yield cf
+def about_prefs_privacy(driver):
+    return AboutPrefs(driver, category="privacy")
 
 
 @pytest.fixture()
-def autofill_popup(driver):
-    yield AutofillPopup(driver)
+def about_prefs(driver):
+    return AboutPrefs(driver)
 
 
 @pytest.fixture()
-def util():
-    yield Utilities()
+def populate_saved_payments(
+    about_prefs_privacy: AboutPrefs, util: Utilities, region: str
+):
+    """Fixture to add cc data through saved payments method."""
+    # Go to about:preferences#privacy and open Saved Payment Methods
+    about_prefs_privacy.open()
+    about_prefs_privacy.open_and_switch_to_saved_payments_popup()
+
+    # Save CC information using fake data
+    credit_card_sample_data = util.fake_credit_card_data(region)
+
+    # Add a new CC profile
+    about_prefs_privacy.click_add_on_dialog_element()
+    about_prefs_privacy.add_entry_to_saved_payments(credit_card_sample_data)
+    return credit_card_sample_data
 
 
 @pytest.fixture()
-def about_prefs_privacy(driver):
-    yield AboutPrefs(driver, category="privacy")
+def populate_saved_addresses(
+    about_prefs_privacy: AboutPrefs, util: Utilities, region: str
+):
+    """Fixture to add cc data through saved payments method."""
+    # Go to about:preferences#privacy and open Saved Addresses Methods
+    about_prefs_privacy.open()
+    about_prefs_privacy.open_and_switch_to_saved_addresses_popup()
+
+    # Save address information using fake data
+    address_data_sample_data = util.fake_autofill_data(region)
+
+    # Add a new address profile
+    about_prefs_privacy.click_add_on_dialog_element()
+    about_prefs_privacy.add_entry_to_saved_addresses(address_data_sample_data)
+    return address_data_sample_data
 
 
 @pytest.fixture()
-def about_prefs(driver):
-    yield AboutPrefs(driver)
+def fill_and_save_address(
+    address_autofill: AddressFill, url_template: str | None, region: str, request
+):
+    """
+    Fixture to populate address entry depending on whether the url is a live site.
+    If live site, populate data through about:prefs, if not fill directly through page.
+    """
+    if url_template:
+        return request.getfixturevalue("populate_saved_addresses")
+    address_autofill.open()
+    return address_autofill.fill_and_save(region)
+
+
+@pytest.fixture()
+def fill_and_save_payments(
+    credit_card_autofill: CreditCardFill, url_template: str | None, region: str, request
+):
+    """
+    Fixture to populate cc entry depending on whether the url is a live site.
+    If live site, populate data through about:prefs, if not fill directly through page.
+    """
+    if url_template:
+        return request.getfixturevalue("populate_saved_payments")
+    credit_card_autofill.open()
+    return credit_card_autofill.fill_and_save(region)

l10n_CM/Unified/test_demo_ad_0_add_new_address.py

@@ -3,6 +3,7 @@
 import pytest
 from selenium.webdriver import Firefox
 
+from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_prefs import AboutPrefs
 from modules.util import Utilities
 
@@ -21,23 +22,21 @@ def add_to_prefs_list(region: str):
 
 
 def test_verify_new_address_is_added(
-    driver: Firefox, region: str, about_prefs_privacy: AboutPrefs, util: Utilities
+    driver: Firefox,
+    region: str,
+    about_prefs_privacy: AboutPrefs,
+    util: Utilities,
+    populate_saved_addresses: AutofillAddressBase,
 ):
     """
     C2886580: Verify that a new Address can be added
     """
     # invert state_province_abbr to help with verification
     inverted_state_province_abbr = {v: k for k, v in util.state_province_abbr.items()}
-    # generate fake data for region
-    address_autofill_data = util.fake_autofill_data(region)
 
-    # open saved addresses
-    about_prefs_privacy.open()
+    # address autofill data
+    address_autofill_data = populate_saved_addresses
     about_prefs_privacy.open_and_switch_to_saved_addresses_popup()
-    # add new entry to saved addresses
-    about_prefs_privacy.click_add_on_dialog_element()
-    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

l10n_CM/Unified/test_demo_ad_1a_dropdown_name_org_fields.py

@@ -2,6 +2,7 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object_autofill_popup import AutofillPopup
+from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
 from modules.util import Utilities
 
@@ -17,15 +18,14 @@ def test_dropdown_presence_name_organization(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888556 - Verify that the autofill dropdown is displayed  for the name and organization fields after an address was
     previously saved
     """
-
-    # Create fake data and fill it in
+    # open address filling url page
     address_autofill.open()
-    address_autofill.fill_and_save(region)
 
     # Verify that the name and organization fields have the autofill dropdown present
     fields_to_test = ["name", "organization"]

l10n_CM/Unified/test_demo_ad_1b_dropdown_address_fields.py

@@ -2,6 +2,7 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object_autofill_popup import AutofillPopup
+from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
 from modules.util import Utilities
 
@@ -17,15 +18,14 @@ def test_dropdown_presence_address_field(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888561 - Verify that the autofill dropdown is displayed  for the eligible address fields after an address was
     previously saved
     """
-
-    # Create fake data and fill it in
+    # open address filling url page
     address_autofill.open()
-    address_autofill.fill_and_save(region)
 
     fields_to_test = [
         "street_address",

l10n_CM/Unified/test_demo_ad_1c_dropdown_phone_email_fields.py

@@ -2,6 +2,7 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object_autofill_popup import AutofillPopup
+from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
 from modules.util import Utilities
 
@@ -17,15 +18,15 @@ def test_dropdown_presence_email_phone_field(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888567 - Verify that the autofill dropdown is displayed for the email and phone fields
     after the contact information was previously saved.
     """
 
-    # Open autofill page and fill fake data
+    # Open autofill page
     address_autofill.open()
-    address_autofill.fill_and_save(region)
 
     fields_to_test = ["email", "telephone"]
 

l10n_CM/Unified/test_demo_ad_2a_preview_name_org_fields.py

@@ -2,6 +2,7 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object_autofill_popup import AutofillPopup
+from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
 from modules.util import Utilities
 
@@ -17,13 +18,16 @@ def test_demo_ad_hover_name_org(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888557 - Verify Autofill Preview on hover over dropdown entries for name/org fields
     """
-    # Create fake data and fill it in
+    # Create fake data
     address_autofill.open()
-    autofill_data = address_autofill.fill_and_save(region)
+
+    # created fake data
+    autofill_data = fill_and_save_address
 
     # Hover over each field and check data preview
     fields_to_test = ["name", "organization"]

l10n_CM/Unified/test_demo_ad_2b_preview_address_fields.py

@@ -2,6 +2,7 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object_autofill_popup import AutofillPopup
+from modules.classes.autofill_base import AutofillAddressBase
 from modules.page_object_autofill import AddressFill
 from modules.page_object_prefs import AboutPrefs
 from modules.util import Utilities
@@ -27,13 +28,16 @@ def test_hover_address_is_previewed(
     address_autofill: AddressFill,
     autofill_popup: AutofillPopup,
     util: Utilities,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888562: Verify that hovering over address fields will preview all fields
     """
-    # Create fake data and fill it in
+    # Create fake data
     address_autofill.open()
-    autofill_data = address_autofill.fill_and_save(region)
+
+    # created fake data
+    autofill_data = fill_and_save_address
 
     # Hover over each field and check data preview
     fields_to_test = [