base structure for live testing set for walmart address page

l10n_CM/Unified/conftest.py

@@ -38,9 +38,9 @@ def prefs_list(add_to_prefs_list: List[tuple[str, str | bool]], region: str):
 
 @pytest.fixture()
 def site_data():
-    live_site = os.environ.get("FX_SITE", None)
+    # live_site = os.environ.get("FX_SITE", None)
     # un comment to test a live site form
-    # live_site = "walmart/walmart_ad"
+    live_site = "walmart/walmart_ad"
     if live_site:
         path_to_site = parent_dir + "/constants/"
         with open(path_to_site + live_site + ".json", "r") as fp:

l10n_CM/Unified/test_demo_ad_1a_dropdown_name_org_fields.py

@@ -28,7 +28,7 @@ def test_dropdown_presence_name_organization(
     address_autofill.open()
 
     # Verify that the name and organization fields have the autofill dropdown present
-    fields_to_test = ["name", "organization"]
+    fields_to_test = ["name", "given_name", "family_name", "organization"]
 
     address_autofill.verify_field_autofill_dropdown(
         region=region, fields_to_test=fields_to_test

l10n_CM/Unified/test_demo_ad_2a_preview_name_org_fields.py

@@ -30,6 +30,6 @@ def test_demo_ad_hover_name_org(
     autofill_data = fill_and_save_address
 
     # Hover over each field and check data preview
-    fields_to_test = ["name", "organization"]
+    fields_to_test = ["name", "given_name", "family_name", "organization"]
     for field in fields_to_test:
         address_autofill.check_autofill_preview_for_field(field, autofill_data, region)

l10n_CM/Unified/test_demo_ad_2c_preview_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.page_object_prefs import AboutPrefs
 from modules.util import Utilities
@@ -19,10 +20,13 @@ def test_hover_email_and_phone_autofill_preview(
     address_autofill: AddressFill,
     autofill_popup: AutofillPopup,
     util: Utilities,
+    fill_and_save_address: AutofillAddressBase,
 ):
-    # 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 = ["email", "telephone"]

l10n_CM/Unified/test_demo_ad_3a_autofill_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,13 +18,16 @@ def test_demo_ad_autofill_address_fields(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888563 - Verify Autofill functionality when selecting an entry from the dropdown for address fields
     """
-    # Create fake data and fill it in
+    # Create fake data
     address_autofill.open()
-    address_autofill_data = address_autofill.fill_and_save(region)
+
+    # created fake data
+    autofill_data = fill_and_save_address
 
     # List of field labels to be autofilled and verified
     fields_to_test = [
@@ -35,4 +39,4 @@ def test_demo_ad_autofill_address_fields(
     ]
     # Loop through each field and perform the autofill test
     for field in fields_to_test:
-        address_autofill.clear_and_verify(field, address_autofill_data, region=region)
+        address_autofill.clear_and_verify(field, autofill_data, region=region)

l10n_CM/Unified/test_demo_ad_3b_autofill_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,17 +18,20 @@ def test_demo_ad_autofill_name_org(
     address_autofill: AddressFill,
     autofill_popup: AutofillPopup,
     util: Utilities,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888558 - Verify Autofill functionality when selecting an entry from the dropdown for name/org fields
     """
-    # Create fake data and fill it in
+    # Create fake data
     address_autofill.open()
-    address_autofill_data = address_autofill.fill_and_save(region)
+
+    # created fake data
+    autofill_data = fill_and_save_address
 
     # List of field labels to be autofilled and verified
-    fields_to_test = ["name", "organization"]
+    fields_to_test = ["name", "given_name", "family_name", "organization"]
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:
-        address_autofill.clear_and_verify(field, address_autofill_data, region=region)
+        address_autofill.clear_and_verify(field, autofill_data, region=region)

l10n_CM/Unified/test_demo_ad_3c_autofill_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,17 +18,20 @@ def test_demo_ad_autofill_phone_email(
     address_autofill: AddressFill,
     autofill_popup: AutofillPopup,
     util: Utilities,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888569 - Verify Autofill functionality when selecting an entry from the dropdown for tele/email fields
     """
-    # Create fake data and fill it in
+    # Create fake data
     address_autofill.open()
-    address_autofill_data = address_autofill.fill_and_save(region)
+
+    # created fake data
+    autofill_data = fill_and_save_address
 
     # List of field labels to be autofilled and verified
     fields_to_test = ["email", "telephone"]
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:
-        address_autofill.clear_and_verify(field, address_autofill_data, region=region)
+        address_autofill.clear_and_verify(field, autofill_data, region=region)

l10n_CM/Unified/test_demo_ad_4a_highlight_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,14 +18,16 @@ def test_address_yellow_highlight_on_name_organization_fields(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888559 - Verify the yellow highlight appears on autofilled fields for name and organization.
     """
-    if address_autofill.is_field_present("name"):
+    if address_autofill.is_field_present("name") or address_autofill.is_field_present(
+        "given_name"
+    ):
         # Create fake data and fill it in
         address_autofill.open()
-        address_autofill.fill_and_save(region)
 
         # Double click inside name field and select a saved address entry from the dropdown
         address_autofill.click_form_field("name")

l10n_CM/Unified/test_demo_ad_4b_highlight_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,14 +18,14 @@ def test_address_yellow_highlight_address_fields(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888564 - Verify the yellow highlight appears on autofilled fields for the address fields.
     """
     if address_autofill.is_field_present("street_address"):
         # Create fake data and fill it in
         address_autofill.open()
-        address_autofill.fill_and_save(region)
 
         # Double click inside name field and select a saved address entry from the dropdown
         address_autofill.click_form_field("street_address")

l10n_CM/Unified/test_demo_ad_4c_highlight_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,14 +18,14 @@ def test_address_yellow_highlight_address_fields(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888570 - Verify the yellow highlight appears on autofilled fields for the email and phone fields.
     """
     if address_autofill.is_field_present("email"):
         # Create fake data and fill it in
         address_autofill.open()
-        address_autofill.fill_and_save(region)
 
         # Double click inside name field and select a saved address entry from the dropdown
         address_autofill.click_form_field("email")

l10n_CM/Unified/test_demo_ad_5a_clear_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,16 +18,16 @@ def test_demo_ad_clear_name_org(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888560 - Verify clear functionality after selecting an entry from name/org fields
     """
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill.fill_and_save(region)
 
     # List of field labels to be autofilled and verified
-    fields_to_test = ["name", "organization"]
+    fields_to_test = ["name", "given_name", "family_name", "organization"]
 
     # Loop through each field and perform the autofill test
     for field in fields_to_test:

l10n_CM/Unified/test_demo_ad_5b_clear_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,13 +18,13 @@ def test_demo_ad_clear_address_fields(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888565 - Verify clear functionality after selecting an entry from address fields
     """
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill.fill_and_save(region)
 
     # List of field labels to be autofilled and verified
     fields_to_test = [

l10n_CM/Unified/test_demo_ad_5c_clear_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,13 +18,13 @@ def test_demo_ad_clear_tel_email(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
+    fill_and_save_address: AutofillAddressBase,
 ):
     """
     C2888571 - Verify clear functionality after selecting an entry from tele/email fields
     """
     # Create fake data and fill it in
     address_autofill.open()
-    address_autofill.fill_and_save(region)
 
     # List of field labels to be autofilled and verified
     fields_to_test = ["email", "telephone"]

l10n_CM/Unified/test_demo_ad_6_capture_doorhanger_appearance.py

@@ -17,13 +17,17 @@ def test_address_doorhanger_displayed_after_entering_valid_address(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
+    url_template: str,
 ):
     """
     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.fill_and_save(region, door_hanger=False)
+    if not url_template:
+        # Create fake data and fill it in
+        address_autofill.open()
+        address_autofill.fill_and_save(region, door_hanger=False)
 
-    # Check "Save Address?" door hanger appears in the Address bar
-    autofill_popup.element_visible("address-save-doorhanger")
+        # Check "Save Address?" door hanger appears in the Address bar
+        autofill_popup.element_visible("address-save-doorhanger")
+    else:
+        pytest.skip("Doorhanger not tested for Live Sites.")