Merge branch 'main' into Hani/cm-holzkern-at

Hani Yacoub · Hani Yacoub · commit 6c6ac8979747 · 2025-08-26T13:35:08.000+03:00
diff --git a/l10n_CM/constants/staples/CA/staples_ad.json b/l10n_CM/constants/staples/CA/staples_ad.json
@@ -0,0 +1,23 @@
+{
+ "url": "http://127.0.0.1:8080/staples_ad.html",
+ "field_mapping": {
+    "given_name": "3b3d82f9-58f3-4274-8aef-9005217f5924",
+    "family_name": "8357dcd8-37b9-400b-8a2c-25f205454830",
+    "street_address": "a65c46a7-f23c-4fd5-9ee3-56d03a11bf2f",
+    "address_level_2": "ff860e00-5b0c-4a79-8215-a790ab09d9ca",
+    "address_level_1": "69fb18cd-6155-4339-9d26-94033beeb651",
+    "postal_code": "7dc1f52d-5afe-43d6-a969-df597917cc93",
+    "telephone": "1c37c9bf-5f50-48cd-8748-3bfb4da03ed0"
+ },
+ "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+ "fields": [
+    "3b3d82f9-58f3-4274-8aef-9005217f5924",
+    "8357dcd8-37b9-400b-8a2c-25f205454830",
+    "ff860e00-5b0c-4a79-8215-a790ab09d9ca",
+    "a65c46a7-f23c-4fd5-9ee3-56d03a11bf2f",
+    "69fb18cd-6155-4339-9d26-94033beeb651",
+    "7dc1f52d-5afe-43d6-a969-df597917cc93",
+    "1c37c9bf-5f50-48cd-8748-3bfb4da03ed0"
+
+ ]
+}
diff --git a/l10n_CM/constants/staples/CA/staples_cc.json b/l10n_CM/constants/staples/CA/staples_cc.json
@@ -0,0 +1,13 @@
+{
+  "url": "http://127.0.0.1:8080/staples_cc.html",
+  "field_mapping": {
+    "card_number": "6193a679-d300-453b-8b76-abde7f81c151",
+    "expiration_date": "e5837950-c398-43b6-b5a9-ea9d9a60a0e0"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": "True",
+  "fields": [
+    "6193a679-d300-453b-8b76-abde7f81c151",
+    "e5837950-c398-43b6-b5a9-ea9d9a60a0e0"
+  ]
+}
diff --git a/l10n_CM/constants/zalando/IT/zalando_ad.json b/l10n_CM/constants/zalando/IT/zalando_ad.json
@@ -0,0 +1,20 @@
+{
+ "url": "http://127.0.0.1:8080/zalando_ad.html",
+ "field_mapping": {
+    "given_name":"c5f8ff92-697e-46dc-bfba-9b9e7cdc14e7",
+    "family_name":"325c01d4-84df-4932-8db6-bfc0cb44a434",
+    "street_address":"e5d2f67c-2506-4d2a-a26d-7c373fe652f2",
+    "postal_code":"116ae2a6-aaf6-4d83-9dc6-6ab532b2613d",
+    "address_level_2": "2373a2e4-629e-41a7-b2fb-2a7d76dbb093"
+
+ },
+ "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+ "fields": [
+    "c5f8ff92-697e-46dc-bfba-9b9e7cdc14e7",
+    "325c01d4-84df-4932-8db6-bfc0cb44a434",
+    "e5d2f67c-2506-4d2a-a26d-7c373fe652f2",
+    "116ae2a6-aaf6-4d83-9dc6-6ab532b2613d",
+    "2373a2e4-629e-41a7-b2fb-2a7d76dbb093"
+
+ ]
+}
diff --git a/l10n_CM/constants/zalando/IT/zalando_cc.json b/l10n_CM/constants/zalando/IT/zalando_cc.json
@@ -0,0 +1,17 @@
+{
+  "url": "http://127.0.0.1:8080/zalando_cc.html",
+  "field_mapping": {
+    "card_name": "9698e0d8-06d5-4538-a5e2-49931904c8a1",
+    "card_number": "bb810e33-ff6f-4755-af03-924b6263b822",
+    "expiration_date": "0f3e3c5e-a4ef-4fbe-997b-40d146ab7e96",
+    "cvv": "adda6a56-6f74-4cb4-9829-19393edf1e2c"
+},
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": "True",
+  "fields": [
+    "9698e0d8-06d5-4538-a5e2-49931904c8a1",
+    "bb810e33-ff6f-4755-af03-924b6263b822",
+    "0f3e3c5e-a4ef-4fbe-997b-40d146ab7e96",
+    "adda6a56-6f74-4cb4-9829-19393edf1e2c"
+]
+}
diff --git a/l10n_CM/region/CA.json b/l10n_CM/region/CA.json
@@ -8,7 +8,8 @@
     "newbalance",
     "canadatire",
     "ebay",
-    "burtsbees"
+    "burtsbees",
+    "staples"
   ],
   "tests": [
   ]
diff --git a/l10n_CM/region/IT.json b/l10n_CM/region/IT.json
@@ -6,7 +6,8 @@
     "tiffany",
     "euronics",
     "douglas",
-    "thenorthface"
+    "thenorthface",
+    "zalando"
   ],
   "tests": [
   ]
diff --git a/l10n_CM/run_l10n.py b/l10n_CM/run_l10n.py
@@ -49,6 +49,7 @@
     "newegg",
     "peacocks",
     "standaardboekhandel",
+    "staples",
     "tanie-leczenie",
     "thenorthface",
     "thomann",
diff --git a/l10n_CM/sites/staples/CA/staples_ad.html b/l10n_CM/sites/staples/CA/staples_ad.html
diff --git a/l10n_CM/sites/staples/CA/staples_cc.html b/l10n_CM/sites/staples/CA/staples_cc.html
diff --git a/l10n_CM/sites/zalando/IT/zalando_ad.html b/l10n_CM/sites/zalando/IT/zalando_ad.html
diff --git a/l10n_CM/sites/zalando/IT/zalando_cc.html b/l10n_CM/sites/zalando/IT/zalando_cc.html
diff --git a/modules/browser_object_autofill_popup.py b/modules/browser_object_autofill_popup.py
@@ -50,8 +50,8 @@ def ensure_autofill_dropdown_visible(self):
 
     @BasePage.context_chrome
     def hover_over_autofill_panel(self):
-        self.element_visible("select-form-option")
-        self.hover("select-form-option")
+        self.element_clickable("pop-up-component-box")
+        self.hover("pop-up-component-box")
         return self
 
     # Interaction with popup elements
diff --git a/modules/testrail_integration.py b/modules/testrail_integration.py
@@ -22,34 +22,86 @@
 TC_EXECUTION_TEMPLATE = "https://firefox-ci-tc.services.mozilla.com/tasks/%TASK_ID%/runs/%RUN_ID%/logs/live/public/logs/live.log"
 
 
-def get_execution_link() -> str:
+def get_execution_link(os_name: str = None) -> str:
     """Using environment variables, get the link to the test execution"""
-    link = ""
+    # TaskCluster (Linux)
+    if os_name == "Linux" and "TASKCLUSTER_PROXY_URL" in os.environ:
+        link = TC_EXECUTION_TEMPLATE
+        for item in ["RUN_ID", "TASK_ID"]:
+            link = link.replace(f"%{item}%", os.environ.get(item))
+        return link
+
+    # GitHub Actions support for Windows and Mac
+    if os_name in ["Windows", "Mac"]:
+        repo = os.environ.get("GITHUB_REPOSITORY")
+        run_id = os.environ.get("GITHUB_RUN_ID")
+        if repo and run_id:
+            return f"https://github.com/{repo}/actions/runs/{run_id}"
+
+    # Generic GitHub run fallback
+    repo = os.environ.get("GITHUB_REPOSITORY")
+    run_id = os.environ.get("GITHUB_RUN_ID")
+    server = os.environ.get("GITHUB_SERVER_URL", "https://github.com")
+    if repo and run_id:
+        return f"{server}/{repo}/actions/runs/{run_id}"
+
+    # Fallback for backward compatibility (when no os_name is passed)
     if "TASKCLUSTER_PROXY_URL" in os.environ:
         link = TC_EXECUTION_TEMPLATE
         for item in ["RUN_ID", "TASK_ID"]:
             link = link.replace(f"%{item}%", os.environ.get(item))
         return link
 
+    logging.warning(
+        f"Could not generate execution link for os_name={os_name}. Missing required environment variables."
+    )
+    return ""
+
 
 def replace_link_in_description(description, os_name) -> str:
     """Add or replace a test execution link in the test run description"""
-    logging.warning(f"Modifying plan description for %{os_name}%")
-    if os_name not in description:
-        # TODO: remove following conditional when links for GHA resolved
-        if os_name == "Linux":
-            return f"{description}\n[{os_name} execution link]({get_execution_link()})"
-    else:
-        link = get_execution_link()
-        if link in description:
-            return description
-        lines = description.split("\n")
-        for i, line in enumerate(lines):
-            if os_name in line:
-                lines[i] = (
-                    f"{description}\n[{os_name} execution link]({get_execution_link()})"
-                )
-    return description
+
+    link = get_execution_link(os_name)
+    if not link:
+        return description
+
+    new_line = f"[{os_name} execution link]({link})"
+    lines = description.splitlines()
+    pat = re.compile(
+        rf"^\s*\[{re.escape(os_name)}\s+execution\s+link\]\(.*?\)\s*$",
+        re.IGNORECASE,
+    )
+
+    # Look for existing line to replace
+    for i, line in enumerate(lines):
+        if pat.match(line):
+            if line.strip() == new_line:
+                return description
+            lines[i] = new_line
+            return "\n".join(lines)
+
+    # No existing line found, append new one
+    lines.append(new_line)
+    return "\n".join(lines)
+
+
+def determine_current_os() -> str:
+    """Determine the current operating system for execution link generation"""
+
+    # Check if we're in GitHub Actions
+    if os.environ.get("GITHUB_ACTIONS"):
+        if sys.platform == "win32":
+            return "Windows"
+        elif sys.platform == "darwin":
+            return "Mac"
+        elif sys.platform.startswith("linux"):
+            return "Linux"
+
+    # Check if we're in TaskCluster (Linux)
+    elif "TASKCLUSTER_PROXY_URL" in os.environ:
+        return "Linux"
+
+    return None
 
 
 def get_plan_title(version_str: str, channel: str) -> str:
@@ -660,11 +712,22 @@ def collect_changes(testrail_session: TestRail, report):
         logging.info(f"Plan found ({expected_plan.get('id')}) but is completed.")
         return None
 
-    # Add execution link to plan description
-
-    os_name = config.split(" ")[0]
-    description = replace_link_in_description(expected_plan["description"], os_name)
-    testrail_session.update_plan(expected_plan["id"], description=description)
+    # Add execution link for current OS only
+    current_os = determine_current_os()
+    if current_os:
+        description = expected_plan.get("description") or ""
+        updated_description = replace_link_in_description(description, current_os)
+        if updated_description != description:
+            logging.info(f"Adding {current_os} execution link to TestRail plan")
+            testrail_session.update_plan(
+                expected_plan["id"], description=updated_description
+            )
+        else:
+            logging.info(
+                f"TestRail plan already has current {current_os} execution link"
+            )
+    else:
+        logging.warning("Could not determine current OS for execution link")
 
     # Find or add correct config for session
 
