Merge branch 'main' into philimon/l10n_flow_optimize

Author: philimon-reset

.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:
@@ -38,7 +37,7 @@ env:
 
 jobs:
   L10N-MacOS:
-    if: ${{ inputs.job_to_run == 'L10N-MacOS' || github.event_name == 'pull_request' || inputs.mac_installer_link }}
+    if: ${{ inputs.job_to_run == 'L10N-MacOS' || inputs.mac_installer_link }}
     runs-on: macos-latest
     steps:
       - name: Create app token
@@ -86,7 +85,7 @@ jobs:
         run: |
           "$FX_EXECUTABLE" --version;
           echo "0" > TEST_EXIT_CODE;
-          pipenv run python choose_l10n_ci_set.py;
+          pipenv run python check_l10n_test_cases.py;
           while IFS= read -r line; do
             echo "Running tests for: $line";
             pipenv run python -m l10n_CM.run_l10n --fx-executable="$FX_EXECUTABLE" $line || SCRIPT_EXIT_CODE=$?;
@@ -122,7 +121,7 @@ jobs:
           name: artifacts-mac
           path: artifacts-mac
   L10N-Linux:
-    if: ${{ inputs.job_to_run == 'L10N-Linux' || github.event_name == 'pull_request' || inputs.linux_tarball_link }}
+    if: ${{ inputs.job_to_run == 'L10N-Linux' || inputs.linux_tarball_link }}
     runs-on: ubuntu-latest
     steps:
       - name: Create app token
@@ -167,7 +166,7 @@ jobs:
         run: |
           "$FX_EXECUTABLE" --version;
           echo "0" > TEST_EXIT_CODE;
-          pipenv run python choose_l10n_ci_set.py;
+          pipenv run python check_l10n_test_cases.py;
           Xvfb :99 -screen 0 '1600x1200x24' > artifacts/xvfb.log &
           while IFS= read -r line; do
             echo "Running tests for: $line";
@@ -204,7 +203,7 @@ jobs:
           name: artifacts-linux
           path: artifacts-linux
   L10N-Windows:
-    if: ${{ inputs.job_to_run == 'L10N-Windows' || github.event_name == 'pull_request' || inputs.win_installer_link }}
+    if: ${{ inputs.job_to_run == 'L10N-Windows' || inputs.win_installer_link }}
     runs-on: windows-latest
     steps:
       - name: Create app token
@@ -278,7 +277,7 @@ jobs:
           pipenv run python -c "import sys; print(sys.platform)"
           $env:FX_EXECUTABLE = 'C:\Program Files\Custom Firefox\firefox.exe'
           Start-Process -FilePath $env:FX_EXECUTABLE -ArgumentList "--version" -Wait -NoNewWindow
-          pipenv run python choose_l10n_ci_set.py
+          pipenv run python check_l10n_test_cases.py
           "0" | Set-Content -Path "TEST_EXIT_CODE"
           $SCRIPT_EXIT_CODE = 0
           Get-Content "selected_l10n_mappings" | ForEach-Object {
@@ -305,7 +304,7 @@ jobs:
           mv ./ci_l10n_pyproject_headed.toml ./pyproject.toml;
           $env:FX_EXECUTABLE = 'C:\Program Files\Custom Firefox\firefox.exe'
           Write-Host "FX_EXECUTABLE: $FX_EXECUTABLE"
-          pipenv run python choose_l10n_ci_set.py
+          pipenv run python check_l10n_test_cases.py
           "0" | Set-Content -Path "TEST_EXIT_CODE"
           $SCRIPT_EXIT_CODE = 0
           Get-Content "selected_l10n_mappings" | ForEach-Object {
@@ -317,8 +316,7 @@ jobs:
                   $SCRIPT_EXIT_CODE = $_.Exception.HResult
               }
           }
-          mkdir artifacts -Force
-          rm artifacts/assets -r -Force -ErrorAction SilentlyContinue
+          rm artifacts/assets -r -Force
           Get-ChildItem -Path "artifacts" | ForEach-Object {
               $destPath = "artifacts-win\" + $_.Name
               if (-not (Test-Path -Path $destPath)) {

.gitignore

@@ -192,9 +192,6 @@ drivers/
 temp.py
 tests/test_scratch.py
 
-# L10N files
-selected_l10n_mappings
-
 # Credentials
 credentials.json
 testrail_credentials.env

check_l10n_test_cases.py

@@ -0,0 +1,30 @@
+import json
+import os
+import sys
+from collections import defaultdict
+
+OUTPUT_FILE = "selected_l10n_mappings"
+
+
+def valid_l10n_mappings():
+    mapping = defaultdict(set)
+    region_paths = [d for d in os.listdir("./l10n_CM/region/")]
+    for region_path in region_paths:
+        if region_path != "Unified.json":
+            region = region_path.split(".")[0]
+            with open(f"./l10n_CM/region/{region_path}", "r+") as f:
+                region_file = json.load(f)
+                if region_file.get("sites"):
+                    for site in region_file.get("sites"):
+                        mapping[site].add(region)
+    return mapping
+
+
+if __name__ == "__main__":
+    l10n_mappings = valid_l10n_mappings()
+    with open(OUTPUT_FILE, "w") as file:
+        pass  # File is created or cleared
+    for site, regions in l10n_mappings.items():
+        with open(OUTPUT_FILE, "a+") as fh:
+            fh.write(f"{site} {' '.join(regions)}\n")
+    sys.exit(0)

l10n_CM/constants/bestbuy/US/bestbuy_ad.json

@@ -12,7 +12,6 @@
 
  },
  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
- "skip": "True",
  "fields": [
     "24fa9bb9-032c-4aa5-a829-8f3c8950cba3",
     "ca35b256-a76c-476b-bc50-5e651c0a20fe",
@@ -22,5 +21,14 @@
     "1f396341-9cfb-400a-9946-80ac1a721c09",
     "afe0ae5c-f224-46f2-9331-aa9b3053dcc8",
     "b9c75b09-1531-479e-8823-45d212333bd2"
- ]
+ ],
+  "skipped": [
+     "test_demo_ad_1c_dropdown_phone_email_fields.py",
+     "test_demo_ad_2c_preview_phone_email_fields.py",
+     "test_demo_ad_3a_autofill_address_fields.py",
+     "test_demo_ad_3b_autofill_name_org_fields.py",
+     "test_demo_ad_3c_autofill_phone_email_fields.py",
+     "test_demo_ad_4c_highlight_phone_email_fields.py",
+     "test_demo_ad_5c_clear_phone_email_fields.py"
+   ]
 }

l10n_CM/constants/calvinklein/CA/calvinklein_ad.json

@@ -11,7 +11,6 @@
     "telephone": "57aab032-b31d-4bf9-8b7a-3fc5f265f6fc"
   },
   "form_field": "*[data-moz-autofill-inspect-id='{given_name}']",
-  "skip": "True",
   "fields": [
     "7d7a6c7c-7084-477e-afda-b27c826032a8",
     "179a5ec2-4a98-45e9-9806-abb5496700d0",
@@ -21,5 +20,14 @@
     "a2d9e97a-4dab-44cf-960f-f5bbc1db447a",
     "e4ebe951-0ed1-4ea9-b2c2-518b7b2ec034",
     "57aab032-b31d-4bf9-8b7a-3fc5f265f6fc"
-  ]
+  ],
+  "skipped": [
+     "test_demo_ad_1c_dropdown_phone_email_fields.py",
+     "test_demo_ad_2c_preview_phone_email_fields.py",
+     "test_demo_ad_3a_autofill_address_fields.py",
+     "test_demo_ad_3b_autofill_name_org_fields.py",
+     "test_demo_ad_3c_autofill_phone_email_fields.py",
+     "test_demo_ad_4c_highlight_phone_email_fields.py",
+     "test_demo_ad_5c_clear_phone_email_fields.py"
+   ]
 }

l10n_CM/constants/cdiscount/FR/cdiscount_cc.json

@@ -4,7 +4,7 @@
     "card_number": "03b45e0e-3ee5-4588-bb52-11c51280b1a1",
     "expiration_date": "1f545e96-cf5e-4bdd-8f70-8d307f9de357",
     "cvv": "963fd1a5-05f5-4464-adba-71c1529dc983",
-    "cardholder_name": "e9f9c0b6-2960-47f0-91ca-74b18b3f1056"
+    "name": "e9f9c0b6-2960-47f0-91ca-74b18b3f1056"
   },
   "form_field": "*[data-moz-autofill-inspect-id='{name}']",
   "fields": [

l10n_CM/region/DE.json

@@ -3,9 +3,6 @@
   "sites": [
     "amazon",
     "mediamarkt",
-    "newbalance",
-    "ebay",
-    "zalando",
     "demo"
   ],
   "tests": [

l10n_CM/region/FR.json

@@ -2,10 +2,6 @@
   "region": "FR",
   "sites": [
     "amazon",
-    "cdiscount",
-    "decathlon",
-    "ebay",
-    "vans",
     "demo"
   ],
   "tests": [

l10n_CM/run_l10n.py

@@ -9,7 +9,7 @@
 
 import requests
 
-from choose_l10n_ci_set import valid_l10n_mappings
+from check_l10n_test_cases import valid_l10n_mappings
 
 current_dir = os.path.dirname(__file__)
 valid_flags = {"--run-headless", "-n", "--reruns", "--fx-executable", "--ci"}

modules/testrail_integration.py

@@ -4,7 +4,7 @@
 import subprocess
 import sys
 
-from choose_l10n_ci_set import valid_l10n_mappings
+from check_l10n_test_cases import valid_l10n_mappings
 from modules import taskcluster as tc
 from modules import testrail as tr
 from modules.testrail import TestRail