Merge branch 'main' into Hani/cm-newbalance-de

Author: philimon-reset

.github/workflows/check-beta.yml

@@ -14,9 +14,9 @@ jobs:
     outputs:
       win_reportable: ${{ steps.reportable.outputs.win }}
       mac_reportable: ${{ steps.reportable.outputs.mac }}
-      mac_l10n_reportable: ${{ steps.reportable.outputs.mac_l10n }}
-      win_l10n_reportable: ${{ steps.reportable.outputs.win_l10n }}
-      linux_l10n_reportable: ${{ steps.reportable.outputs.linux_l10n }}
+      mac_l10n_reportable: ${{ steps.l10n-reportable.outputs.mac_l10n }}
+      win_l10n_reportable: ${{ steps.l10n-reportable.outputs.win_l10n }}
+      linux_l10n_reportable: ${{ steps.l10n-reportable.outputs.linux_l10n }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -83,4 +83,4 @@ jobs:
     uses: ./.github/workflows/l10n.yml
     with:
       job_to_run: L10N-Linux
-    secrets: inherit
+    secrets: inherit

.github/workflows/l10n.yml

@@ -3,7 +3,6 @@ name: L10N Test Execution
 
 run-name: ${{ github.actor }} is running l10n tests
 on:
-  pull_request:
   workflow_call:
     inputs:
       channel:

ci_l10n_pyproject_headed.toml

@@ -15,7 +15,7 @@ markers = [
     "noxvfb: tests that should not run in xvfb sessions"
 ]
 
-addopts = "-vs --ci --json-report --json-report-file artifacts/report_headed.json -n auto --reruns 3 --reruns-delay 2 --html=artifacts/report_headed.html"
+addopts = "-vs --ci --json-report --json-report-file artifacts/report_headed.json -n auto --reruns 4 --reruns-delay 3 --html=artifacts/report_headed.html"
 
 [tool.ruff]
 target-version = "py310"

l10n_CM/Unified/test_demo_ad_0_add_new_address.py

@@ -52,7 +52,7 @@ def test_verify_new_address_is_added(
 def data_sanitizer(util: Utilities, value: str, region: str, state_province: Dict):
     value = value.strip()
     if value[0] == "+":
-        return util.normalize_phone_number(value)
+        return util.normalize_regional_phone_numbers(value, region)
     elif len(value) == 2 and value != region:
         return state_province.get(value, value)
     return value

l10n_CM/constants/ebay/DE/ebay_ad.json

@@ -0,0 +1,20 @@
+{
+  "url": "http://127.0.0.1:8080/ebay_ad.html",
+  "field_mapping": {
+    "country": "e9e70c93-e9d2-409b-b095-e77314197c7c",
+    "given_name": "24d06c38-32ee-4355-8a51-f24a7670b6b2",
+    "family_name": "9470868e-3a3e-47fb-b532-25f921d01c8b",
+    "address_level_1": "56c8b6d4-3cd4-4109-bc1a-d464c51f30c0",
+    "postal_code": "995c03c6-b354-4dc5-a891-fb3acefd11ff",
+    "address_level_2": "701b8a55-61a8-4bfc-8c47-bc218ae1b6e1"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "e9e70c93-e9d2-409b-b095-e77314197c7c",
+    "24d06c38-32ee-4355-8a51-f24a7670b6b2",
+    "9470868e-3a3e-47fb-b532-25f921d01c8b",
+    "56c8b6d4-3cd4-4109-bc1a-d464c51f30c0",
+    "995c03c6-b354-4dc5-a891-fb3acefd11ff",
+    "701b8a55-61a8-4bfc-8c47-bc218ae1b6e1"
+  ]
+}

l10n_CM/constants/ebay/DE/ebay_cc.json

@@ -0,0 +1,18 @@
+{
+  "url": "http://127.0.0.1:8080/ebay_cc.html",
+  "field_mapping": {
+    "card_number": "be35322a-704d-4a43-ab5b-f5d072c34780",
+    "given_name": "488f1f61-d1b3-4eaa-b7ec-fa4d58c570a2",
+    "family_name": "b5422113-5346-404e-b4bd-046df6eb7390",
+    "expiration_date": "06947c0b-6182-434f-8cf2-4c809211968e",
+    "cvv":"e917ae39-68b2-40e3-8feb-259857c57884"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "be35322a-704d-4a43-ab5b-f5d072c34780",
+    "488f1f61-d1b3-4eaa-b7ec-fa4d58c570a2",
+    "b5422113-5346-404e-b4bd-046df6eb7390",
+    "06947c0b-6182-434f-8cf2-4c809211968e",
+    "e917ae39-68b2-40e3-8feb-259857c57884"
+  ]
+}

l10n_CM/constants/ebay/FR/ebay_ad.json

@@ -0,0 +1,24 @@
+{
+  "url": "http://127.0.0.1:8080/ebay_ad.html",
+  "field_mapping": {
+    "country": "d0b2c700-1d21-431c-9b63-15ce879bd1d4",
+    "given_name": "02e8af39-63ef-4161-ba2a-037f1fc0d126",
+    "family_name": "3bbcb88c-0eb3-44f3-97f8-6d53e1b6b3b0",
+    "telephone": "d861a0fd-5093-4a9a-acf3-865630377e05",
+    "address_level_1": "1fa78165-45eb-483a-850f-ede7d77fb276",
+    "email": "81c4f8fa-69ba-435a-824e-d33170457fb2",
+    "address_level_2": "96269fbd-c77b-4bcd-bf56-978d2c1196eb",
+    "postal_code": "48149049-83a7-43b0-ad00-936a7b764257"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "d0b2c700-1d21-431c-9b63-15ce879bd1d4",
+    "02e8af39-63ef-4161-ba2a-037f1fc0d126",
+    "3bbcb88c-0eb3-44f3-97f8-6d53e1b6b3b0",
+    "d861a0fd-5093-4a9a-acf3-865630377e05",
+    "1fa78165-45eb-483a-850f-ede7d77fb276",
+    "81c4f8fa-69ba-435a-824e-d33170457fb2",
+    "96269fbd-c77b-4bcd-bf56-978d2c1196eb",
+    "48149049-83a7-43b0-ad00-936a7b764257"
+  ]
+}

l10n_CM/constants/ebay/FR/ebay_cc.json

@@ -0,0 +1,18 @@
+{
+  "url": "http://127.0.0.1:8080/ebay_cc.html",
+  "field_mapping": {
+    "card_number": "074f3242-21d4-4356-9309-f6c1a2d724e0",
+    "given_name": "00467d92-b775-4596-966f-2bf3d1267c0c",
+    "family_name": "fb594e12-3e59-4175-862f-cd403d982672",
+    "expiration_date": "218d3d69-83f5-46e4-8adc-8251d12b9aa2",
+    "cvv":"59c55fa4-c6fa-4212-896b-b7183182c092"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "074f3242-21d4-4356-9309-f6c1a2d724e0",
+    "00467d92-b775-4596-966f-2bf3d1267c0c",
+    "fb594e12-3e59-4175-862f-cd403d982672",
+    "218d3d69-83f5-46e4-8adc-8251d12b9aa2",
+    "59c55fa4-c6fa-4212-896b-b7183182c092"
+  ]
+}

l10n_CM/region/US.json

@@ -6,6 +6,7 @@
     "lowes",
     "etsy",
     "calvinklein",
+    "bestbuy",
     "demo"
   ],
   "tests": []

l10n_CM/run_l10n.py

@@ -13,7 +13,19 @@
 valid_flags = {"--run-headless", "-n", "--reruns", "--fx-executable", "--ci"}
 flag_with_parameter = {"-n", "--reruns"}
 valid_region = {"US", "CA", "DE", "FR"}
-valid_sites = {"demo", "amazon", "walmart", "mediamarkt", "lowes", "etsy", "calvinklein", "bestbuy", "newbalance"}
+valid_sites = {
+    "demo",
+    "amazon",
+    "walmart",
+    "mediamarkt",
+    "lowes",
+    "etsy",
+    "calvinklein",
+    "bestbuy",
+  "newbalance",
+    "ebay",
+
+}
 live_sites = []
 
 LOCALHOST = "127.0.0.1"
@@ -80,6 +92,7 @@ def run_tests(reg, site, flg, all_tests):
         flg (list[str]): The list of pytest flags to be used.
         all_tests (list[str]): The list of test file paths to execute.
     """
+    all_tests = remove_skipped_tests(all_tests, site, reg)
     try:
         if len(all_tests) > 0:
             logging.info(f"Tests for {reg} region on {site} page.")
@@ -119,6 +132,59 @@ def get_region_tests(test_region: str) -> list[str]:
         )
 
 
+def remove_skipped_tests(extracted_tests, live_site, reg):
+    """
+    Reads the mapping for the given region and site and removes any tests that are marked as skipped.
+
+    Args:
+        extracted_tests (list[str]): The list of test file paths to execute.
+        live_site (str): Page being tested.
+        reg (str): The test region identifier.
+    Returns:
+        list[str]: A list of test file paths for the given region.
+    """
+    mid_path = f"/{reg}/" if live_site != "demo" else "/"
+    live_sites = [
+        (f"{live_site}{mid_path}{live_site}_{suffix}", f"_{suffix}_")
+        for suffix in ("ad", "cc")
+    ]
+    for live_site, suffix in live_sites:
+        skipped_tests = get_skipped_tests(live_site)
+        if skipped_tests and skipped_tests != "All":
+            skipped_tests = list(
+                map(
+                    lambda test: os.path.join(current_dir, "Unified", test),
+                    skipped_tests,
+                )
+            )
+
+        def should_keep_test(test):
+            return (
+                suffix not in test
+                if skipped_tests == "All"
+                else test not in skipped_tests
+            )
+
+        extracted_tests = list(filter(should_keep_test, extracted_tests))
+    return extracted_tests
+
+
+def get_skipped_tests(live_site) -> list[str] | str:
+    """
+    Read the mapping for the given region and site and return any tests that are marked as skipped.
+
+    Arg:
+        live_site (str): The site is being tested.
+    Returns:
+        list[str] | str: A list of tests that should be skipped, or "All" if all tests should be skipped.
+    """
+    with open(current_dir + "/constants/" + live_site + ".json", "r") as fp:
+        live_site_data = load(fp)
+        if live_site_data.get("skip"):
+            return "All"
+        return live_site_data.get("skipped", [])
+
+
 def get_flags_and_sanitize(flags_arguments: list[str]) -> list[str]:
     """
     Extract and validate pytest flags from command-line arguments.