Merge pull request #558 from mozilla/philimon/live-poc

Philimon/live poc

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

@@ -1,4 +1,8 @@
+import errno
+import logging
 import os
+import socket
+from json import load
 from typing import List
 
 import pytest
@@ -8,12 +12,44 @@
 from modules.page_object_prefs import AboutPrefs
 from modules.util import Utilities
 
+current_dir = os.path.dirname(__file__)
+parent_dir = os.path.dirname(current_dir)
+
+LOCALHOST = "127.0.0.1"
+PORT = 8080
+
+
+def is_port_in_use() -> bool:
+    """Check if the port is already open (server running)."""
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        return s.connect_ex((LOCALHOST, PORT)) == 0
+
+
+def get_html_files(live_site, region):
+    address_path_to_site = (
+        parent_dir + f"/sites/{live_site}/{region}/{live_site}_ad.html"
+    )
+    cc_path_to_site = parent_dir + f"/sites/{live_site}/{region}/{live_site}_cc.html"
+    address_html_file, cc_html_file = "", ""
+    if os.path.exists(address_path_to_site) and os.path.exists(cc_path_to_site):
+        with open(address_path_to_site, "r", encoding="utf-8") as fp:
+            address_html_file = fp.read()
+        with open(cc_path_to_site, "r", encoding="utf-8") as fp:
+            cc_html_file = fp.read()
+        return address_html_file, cc_html_file
+    return address_html_file, cc_html_file
+
 
 @pytest.fixture()
 def region():
     return os.environ.get("FX_REGION", "US")
 
 
+@pytest.fixture()
+def live_site():
+    return os.environ.get("CM_SITE", "demo")
+
+
 @pytest.fixture()
 def add_to_prefs_list(region: str):
     return []
@@ -33,30 +69,196 @@ def prefs_list(add_to_prefs_list: List[tuple[str, str | bool]], region: str):
 
 
 @pytest.fixture()
-def address_autofill(driver):
-    yield AddressFill(driver)
+def ad_site_data(live_site, region):
+    ad_live_site = (
+        f"{live_site}/{region}/{live_site}_ad"
+        if live_site != "demo"
+        else f"{live_site}/{live_site}_ad"
+    )
+    path_to_site = parent_dir + "/constants/"
+    with open(path_to_site + ad_live_site + ".json", "r") as fp:
+        live_site_data = load(fp)
+        # Remove address level 1 for regions other than US and CA
+        if region not in {"US", "CA"} and live_site_data["field_mapping"].get(
+            "address_level_1"
+        ):
+            live_site_data["fields"].remove(
+                live_site_data["field_mapping"]["address_level_1"]
+            )
+            del live_site_data["field_mapping"]["address_level_1"]
+        return live_site_data
+
+
+@pytest.fixture()
+def cc_site_data(live_site, region):
+    cc_live_site = (
+        f"{live_site}/{region}/{live_site}_cc"
+        if live_site != "demo"
+        else f"{live_site}/{live_site}_cc"
+    )
+    path_to_site = parent_dir + "/constants/"
+    with open(path_to_site + cc_live_site + ".json", "r") as fp:
+        live_site_data = load(fp)
+        return live_site_data
+
+
+@pytest.fixture
+def is_live_site(live_site):
+    """Determine if the site is live."""
+    return live_site != "demo"
+
+
+@pytest.fixture(scope="session")
+def httpserver_listen_address():
+    """Set port for local http server"""
+    return LOCALHOST, PORT
+
+
+@pytest.fixture()
+def serve_live_site(is_live_site, live_site, region, request):
+    """Serve the live site only if needed."""
+    if not is_live_site or is_port_in_use():
+        return
+    # only serve content if url is already not served.
+    try:
+        ad_html_file, cc_html_file = get_html_files(live_site, region)
+        http_server = request.getfixturevalue("httpserver")
+        http_server.expect_request(f"/{live_site}_ad.html").respond_with_data(
+            ad_html_file, content_type="text/html"
+        )
+        http_server.expect_request(f"/{live_site}_cc.html").respond_with_data(
+            cc_html_file, content_type="text/html"
+        )
+    except OSError as e:
+        if e == errno.EADDRINUSE:
+            logging.info(f"{live_site} already served.")
+    finally:
+        return
+
+
+@pytest.fixture()
+def ad_form_field(ad_site_data):
+    selector = ad_site_data.get("form_field")
+    return (
+        {"form-field": {"selectorData": selector, "strategy": "css", "groups": []}}
+        if selector
+        else {}
+    )
+
+
+@pytest.fixture()
+def cc_form_field(cc_site_data):
+    selector = cc_site_data.get("form_field")
+    return (
+        {"form-field": {"selectorData": selector, "strategy": "css", "groups": []}}
+        if selector
+        else {}
+    )
+
+
+@pytest.fixture()
+def address_autofill(driver, ad_site_data, ad_form_field, serve_live_site):
+    af = AddressFill(
+        driver,
+        url_template=ad_site_data.get("url"),
+        field_mapping=ad_site_data.get("field_mapping"),
+        fields=ad_site_data.get("fields"),
+    )
+    af.elements |= ad_form_field
+    return af
+
+
+@pytest.fixture()
+def credit_card_autofill(driver, cc_site_data, cc_form_field, serve_live_site):
+    cf = CreditCardFill(
+        driver,
+        url_template=cc_site_data.get("url"),
+        field_mapping=cc_site_data.get("field_mapping"),
+        fields=cc_site_data.get("fields"),
+    )
+    cf.elements |= cc_form_field
+    return cf
 
 
 @pytest.fixture()
 def autofill_popup(driver):
-    yield AutofillPopup(driver)
+    return AutofillPopup(driver)
 
 
 @pytest.fixture()
 def util():
-    yield Utilities()
+    return Utilities()
 
 
 @pytest.fixture()
 def about_prefs_privacy(driver):
-    yield AboutPrefs(driver, category="privacy")
+    return AboutPrefs(driver, category="privacy")
 
 
 @pytest.fixture()
 def about_prefs(driver):
-    yield AboutPrefs(driver)
+    return AboutPrefs(driver)
+
+
+@pytest.fixture()
+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 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 fill_and_save_address(
+    address_autofill: AddressFill, ad_site_data, 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 ad_site_data.get("url"):
+        return request.getfixturevalue("populate_saved_addresses")
+    address_autofill.open()
+    return address_autofill.fill_and_save(region)
 
 
 @pytest.fixture()
-def credit_card_autofill(driver):
-    yield CreditCardFill(driver)
+def fill_and_save_payments(
+    credit_card_autofill: CreditCardFill, cc_site_data, 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 cc_site_data.get("url"):
+        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

@@ -1,9 +1,8 @@
 import pytest
 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
 
 
 @pytest.fixture()
@@ -15,20 +14,20 @@ def test_dropdown_presence_name_organization(
     driver: Firefox,
     region: str,
     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)
+
+    # scroll to first form field
+    address_autofill.scroll_to_form_field()
 
     # 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