further work to support DE and FR regions and clean up

Author: philimon-reset

l10n_CM/Unified/conftest.py

@@ -20,7 +20,7 @@ def region():
 
 @pytest.fixture()
 def live_site():
-    return os.environ.get("FX_SITE")
+    return os.environ.get("CM_SITE", "demo")
 
 
 @pytest.fixture()
@@ -42,40 +42,44 @@ def prefs_list(add_to_prefs_list: List[tuple[str, str | bool]], region: str):
 
 
 @pytest.fixture()
-def ad_site_data(live_site):
+def ad_site_data(live_site, region):
     ad_live_site = f"{live_site}/{live_site}_ad"
-    if live_site:
-        path_to_site = parent_dir + "/constants/"
-        with open(path_to_site + ad_live_site + ".json", "r") as fp:
-            live_site_data = load(fp)
-            return live_site_data
-    return {}
+    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 ad_url_template(ad_site_data):
-    return ad_site_data.get("url", None)
+def ad_is_live_site(live_site):
+    return live_site != "demo"
 
 
 @pytest.fixture()
 def cc_site_data(live_site):
     cc_live_site = f"{live_site}/{live_site}_cc"
-    if live_site:
-        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
-    return {}
+    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 cc_url_template(cc_site_data):
-    return cc_site_data.get("url", None)
+def cc_is_live_site(live_site):
+    return live_site != "demo"
 
 
 @pytest.fixture()
 def ad_form_field(ad_site_data):
-    selector = ad_site_data.get("form_field", None)
+    selector = ad_site_data.get("form_field")
     return (
         {"form-field": {"selectorData": selector, "strategy": "css", "groups": []}}
         if selector
@@ -85,7 +89,7 @@ def ad_form_field(ad_site_data):
 
 @pytest.fixture()
 def cc_form_field(cc_site_data):
-    selector = cc_site_data.get("form_field", None)
+    selector = cc_site_data.get("form_field")
     return (
         {"form-field": {"selectorData": selector, "strategy": "css", "groups": []}}
         if selector

l10n_CM/Unified/test_demo_ad_6_capture_doorhanger_appearance.py

@@ -17,12 +17,12 @@ def test_address_doorhanger_displayed_after_entering_valid_address(
     address_autofill: AddressFill,
     util: Utilities,
     autofill_popup: AutofillPopup,
-    ad_url_template: str,
+    ad_is_live_site: str,
 ):
     """
     C2886581 - Verify the Capture Door hanger is displayed after entering valid Address data
     """
-    if not ad_url_template:
+    if not ad_is_live_site:
         # Create fake data and fill it in
         address_autofill.open()
         # scroll to first form field

l10n_CM/Unified/test_demo_ad_7a_capture_doorhanger_stored_data_name_org_fields.py

@@ -19,12 +19,12 @@ def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
     util: Utilities,
     autofill_popup: AutofillPopup,
     about_prefs_privacy: AboutPrefs,
-    ad_url_template: str,
+    ad_is_live_site: str,
 ):
     """
     C2888701 - Verify name/org fields are captured in the Capture Doorhanger and stored in about:preferences
     """
-    if not ad_url_template:
+    if not ad_is_live_site:
         # Create fake data and fill it in
         address_autofill.open()
         # scroll to first form field

l10n_CM/Unified/test_demo_ad_7b_capture_doorhanger_stored_data_address_fields.py

@@ -19,12 +19,12 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
     util: Utilities,
     autofill_popup: AutofillPopup,
     about_prefs_privacy: AboutPrefs,
-    ad_url_template: str,
+    ad_is_live_site: str,
 ):
     """
     C2888703 - Verify Address data are captured in the Capture Doorhanger and stored in about:preferences
     """
-    if not ad_url_template:
+    if not ad_is_live_site:
         # Create fake data and fill it in
         address_autofill.open()
 

l10n_CM/Unified/test_demo_ad_7c_capture_doorhanger_stored_data_phone_email.py

@@ -19,12 +19,12 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
     util: Utilities,
     autofill_popup: AutofillPopup,
     about_prefs_privacy: AboutPrefs,
-    ad_url_template: str,
+    ad_is_live_site: str,
 ):
     """
     C2888704 - Verify tele/email data are captured in the Capture Doorhanger and stored in about:preferences
     """
-    if not ad_url_template:
+    if not ad_is_live_site:
         # Create fake data and fill it in
         address_autofill.open()
 

l10n_CM/Unified/test_demo_cc_6_capture_doorhanger_appearance.py

@@ -17,12 +17,12 @@ def test_cc_check_door_hanger_is_displayed(
     util: Utilities,
     autofill_popup: AutofillPopup,
     credit_card_autofill: CreditCardFill,
-    cc_url_template: str,
+    cc_is_live_site: str,
 ):
     """
     C2889441 - Ensures that the door hanger is displayed after filling credit card info
     """
-    if not cc_url_template:
+    if not cc_is_live_site:
         # Navigate to page
         credit_card_autofill.open()
 

l10n_CM/Unified/test_demo_cc_7_capture_doorhanger_capture_and_stored_data.py

@@ -19,12 +19,12 @@ def test_demo_cc_data_captured_in_doorhanger_and_stored(
     autofill_popup: AutofillPopup,
     util: Utilities,
     about_prefs_privacy: AboutPrefs,
-    cc_url_template: str,
+    cc_is_live_site: str,
 ):
     """
     C2889999 - Verify credit card data is captured in the Capture Doorhanger and stored in about:preferences
     """
-    if not cc_url_template:
+    if not cc_is_live_site:
         # Navigate to page
         credit_card_autofill.open()
 

l10n_CM/constants/amazon/amazon_ad.json

@@ -1,5 +1,5 @@
 {
-  "url": "http://127.0.0.1:8000/amazon_ad.html",
+  "url": "http://127.0.0.1:8080/amazon_ad.html",
   "field_mapping": {
     "name": "152ffe55-1b63-4bf7-a43c-21d217d8aca1",
     "street_address": "33198fca-ddab-40a0-bc03-8b6f83bc3a98",

l10n_CM/constants/amazon/amazon_cc.json

@@ -1,5 +1,5 @@
 {
-  "url": "http://127.0.0.1:8000/amazon_cc.html",
+  "url": "http://127.0.0.1:8080/amazon_cc.html",
   "field_mapping": {
     "card_number": "7901475e-bfea-4607-98f9-abb787d3dc57",
     "name": "4f630b6e-efd1-458d-9762-9a12a3dd28de",

l10n_CM/constants/demo/demo_ad.json

@@ -0,0 +1,25 @@
+{
+  "url": "https://mozilla.github.io/form-fill-examples/basic.html",
+  "field_mapping": {
+    "name": "name",
+    "organization": "organization",
+    "street_address": "street-address",
+    "address_level_2": "address-level2",
+    "address_level_1": "address-level1",
+    "postal_code": "postal-code",
+    "country_code": "country",
+    "email": "email",
+    "telephone": "tel"
+  },
+  "fields": [
+    "name",
+    "organization",
+    "street-address",
+    "address-level2",
+    "address-level1",
+    "postal-code",
+    "country",
+    "email",
+    "tel"
+  ]
+}