merge main

Hani Yacoub · Hani Yacoub · commit 59131e74e883 · 2025-08-05T12:19:38.000+03:00
diff --git a/l10n_CM/constants/peacocks/GB/peacocks_ad.json b/l10n_CM/constants/peacocks/GB/peacocks_ad.json
@@ -0,0 +1,23 @@
+{
+  "url": "http://127.0.0.1:8080/peacocks_ad.html",
+  "field_mapping": {
+    "given_name": "2fb50c78-6562-462d-9b34-c967f30e63a3",
+    "family_name": "b1cc8bd9-057e-49ca-bf8e-5b18e1880854",
+    "street_address": "9fc1faad-e6d2-43a0-bc0d-6ceb88a3d01c",
+    "address_level_2": "32891e12-a4e5-4cd1-94c7-36d38328c899",
+    "postal_code": "8621750d-0979-4795-9079-e40eeef17f66",
+    "country": "f132c39a-0cf7-49ce-bad1-12b4e075af02",
+    "telephone": "3de63156-1e5d-4512-ad88-3493385f9ab2"
+  },
+
+  "form_field": "*[data-moz-autofill-inspect-id='{given_name}']",
+  "fields": [
+    "2fb50c78-6562-462d-9b34-c967f30e63a3",
+    "b1cc8bd9-057e-49ca-bf8e-5b18e1880854",
+    "9fc1faad-e6d2-43a0-bc0d-6ceb88a3d01c",
+    "32891e12-a4e5-4cd1-94c7-36d38328c899",
+    "8621750d-0979-4795-9079-e40eeef17f66",
+    "f132c39a-0cf7-49ce-bad1-12b4e075af02",
+    "3de63156-1e5d-4512-ad88-3493385f9ab2"
+  ]
+}
diff --git a/l10n_CM/constants/peacocks/GB/peacocks_cc.json b/l10n_CM/constants/peacocks/GB/peacocks_cc.json
@@ -0,0 +1,19 @@
+{
+  "url": "http://127.0.0.1:8080/peacocks_cc.html",
+  "field_mapping": {
+    "card_number": "72b3f40c-b66c-4a02-adfb-a79a2868fa45",
+    "name": "71408c5c-451b-4242-9ed7-550cf4a8c893",
+    "expiration_month": "6f76ab0a-3ee3-4fcb-a047-b2dac639e54a",
+    "expiration_year": "fe5c1862-ad33-4df4-abca-c45b1ccd989a",
+    "cvv": "a544ec67-6767-4c72-9484-b247b32c2827"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": "True",
+  "fields": [
+    "72b3f40c-b66c-4a02-adfb-a79a2868fa45",
+    "71408c5c-451b-4242-9ed7-550cf4a8c893",
+    "6f76ab0a-3ee3-4fcb-a047-b2dac639e54a",
+    "fe5c1862-ad33-4df4-abca-c45b1ccd989a",
+    "a544ec67-6767-4c72-9484-b247b32c2827"
+  ]
+}
diff --git a/l10n_CM/constants/thomann/DE/thomann_ad.json b/l10n_CM/constants/thomann/DE/thomann_ad.json
@@ -0,0 +1,27 @@
+{
+  "url": "http://127.0.0.1:8080/thomann_ad.html",
+  "field_mapping": {
+    "organization": "77ab7eab-bd86-4658-ab17-f29af596f7a8",
+    "given_name": "7ef779ba-f521-4823-90a2-6e21ca472da3",
+    "family_name": "10e0055a-778e-40e5-94ff-5e6bef694af2",
+    "address_level_2": "66cac315-4e9c-49fc-99a8-4fff18c20851",
+    "street_address": "fd6b2396-b4ac-4ed4-a786-521a13fab7bb",
+    "postal_code": "b3429de2-79c2-4843-9f2a-330044334546",
+    "country": "9078b023-3840-4c74-bdc7-d2fd08b6ae2e",
+    "telephone": "ad50e28c-f72d-458e-913e-62213d4b4575",
+    "email": "f616f843-6521-4a63-957d-523171d50514"
+
+},
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "77ab7eab-bd86-4658-ab17-f29af596f7a8",
+    "7ef779ba-f521-4823-90a2-6e21ca472da3",
+    "10e0055a-778e-40e5-94ff-5e6bef694af2",
+    "66cac315-4e9c-49fc-99a8-4fff18c20851",
+    "fd6b2396-b4ac-4ed4-a786-521a13fab7bb",
+    "b3429de2-79c2-4843-9f2a-330044334546",
+    "9078b023-3840-4c74-bdc7-d2fd08b6ae2e",
+    "ad50e28c-f72d-458e-913e-62213d4b4575",
+    "f616f843-6521-4a63-957d-523171d50514"
+]
+}
diff --git a/l10n_CM/constants/thomann/DE/thomann_cc.json b/l10n_CM/constants/thomann/DE/thomann_cc.json
@@ -0,0 +1,15 @@
+{
+  "url": "http://127.0.0.1:8080/thomann_cc.html",
+  "field_mapping": {
+    "card_number": "11111111-aaaa-bbbb-cccc-000000000000",
+    "expiration_date": "22222222-bbbb-cccc-dddd-111111111111",
+    "cvv": "33333333-cccc-dddd-eeee-222222222222"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": "True",
+  "fields": [
+    "11111111-aaaa-bbbb-cccc-000000000000",
+    "22222222-bbbb-cccc-dddd-111111111111",
+    "33333333-cccc-dddd-eeee-222222222222"
+  ]
+}
diff --git a/l10n_CM/region/GB.json b/l10n_CM/region/GB.json
@@ -3,6 +3,7 @@
   "sites": [
     "ebay",
     "demo",
+    "peacocks",
     "whittard",
     "diy"
   ],
diff --git a/l10n_CM/run_l10n.py b/l10n_CM/run_l10n.py
@@ -34,11 +34,13 @@
     "cdiscount",
     "aldoshoes",
     "canadatire",
+    "thomann",
+    "wish",
     "artsper",
     "justspices",
     "yellowkorner",
-    "wish",
     "bijoubrigitte",
+    "peacocks",
     "whittard",
     "diy"
 }
diff --git a/l10n_CM/sites/peacocks/GB/peacocks_ad.html b/l10n_CM/sites/peacocks/GB/peacocks_ad.html
diff --git a/l10n_CM/sites/peacocks/GB/peacocks_cc.html b/l10n_CM/sites/peacocks/GB/peacocks_cc.html
diff --git a/l10n_CM/sites/thomann/DE/thomann_ad.html b/l10n_CM/sites/thomann/DE/thomann_ad.html
diff --git a/l10n_CM/sites/thomann/DE/thomann_cc.html b/l10n_CM/sites/thomann/DE/thomann_cc.html
diff --git a/modules/page_object_autofill.py b/modules/page_object_autofill.py
@@ -235,10 +235,11 @@ def verify_form_data(
             expected_value = getattr(sample_data, attr_name, None)
             auto_filled_field_value = self._get_field_value(field_name)
 
-            # Normalize values for comparison
-            expected_value, auto_filled_field_value = self._normalize_values(
-                attr_name, expected_value, auto_filled_field_value, region
-            )
+            # Normalize values for comparison if they are different
+            if auto_filled_field_value != expected_value:
+                expected_value, auto_filled_field_value = self._normalize_values(
+                    attr_name, expected_value, auto_filled_field_value, region
+                )
 
             assert expected_value in auto_filled_field_value, (
                 f"Field '{attr_name}' ('{field_name}'): expected '{expected_value}' to be in '{auto_filled_field_value}'"
@@ -260,7 +261,7 @@ def _normalize_values(
         region: str,
     ) -> tuple[str, str]:
         """Normalize expected and actual values for comparison."""
-        if attr_name == "address_level_1" and auto_filled_field_value != expected_value:
+        if attr_name == "address_level_1":
             expected_value = self.util.get_state_province_abbreviation(expected_value)
         elif attr_name == "expiration_date" and len(auto_filled_field_value) > 5:
             auto_filled_field_value = auto_filled_field_value.replace("20", "")
@@ -408,6 +409,7 @@ def is_yellow_highlight(rgb_tuple):
                 autofill_field = self.get_element("form-field", labels=[field])
                 if autofill_field.tag_name.lower() != "select":
                     autofill_field.clear()
+                    self.scroll_to_element("form-field", labels=[field])
                     # Focus the field so the highlight is visible
                     self.click_on("form-field", labels=[field])
 
diff --git a/modules/testrail.py b/modules/testrail.py
@@ -350,6 +350,18 @@ def create_new_plan_entry(
             payload["runs"] = runs
         return self.client.send_post(f"/add_plan_entry/{plan_id}", payload)
 
+    def update_plan(self, plan_id, **kwargs):
+        """Given a plan id, update the plan per kwargs"""
+        if not kwargs:
+            return False
+        return self.client.send_post(f"/update_plan/{plan_id}", kwargs)
+
+    def update_plan_entry(self, plan_id, entry_id, **kwargs):
+        """Given a plan id and entry id, update the entry per kwargs"""
+        if not kwargs:
+            return False
+        return self.client.send_post(f"/update_plan_entry/{plan_id}/{entry_id}", kwargs)
+
     def matching_configs(self, testrail_project_id, config_group_id, config_name):
         """Given a project id, a config group id, and a config name, return the matching config object"""
         configs = self.client.send_get(f"/get_configs/{testrail_project_id}")
diff --git a/modules/testrail_integration.py b/modules/testrail_integration.py
@@ -19,6 +19,37 @@
 PLAN_NAME_RE = re.compile(r"\[(\w+) (\d+)\]")
 CONFIG_GROUP_ID = 95
 TESTRAIL_FX_DESK_PRJ = 17
+TC_EXECUTION_TEMPLATE = "https://firefox-ci-tc.services.mozilla.com/tasks/%TASK_ID%/runs/%RUN_ID%/logs/public/logs/live.log"
+
+
+def get_execution_link() -> str:
+    """Using environment variables, get the link to the test execution"""
+    link = ""
+    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
+
+
+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
 
 
 def get_plan_title(version_str: str, channel: str) -> str:
@@ -321,6 +352,12 @@ def organize_l10n_entries(
     if len(site_entries) != 1:
         logging.info("Suite entries are broken somehow")
 
+    # 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(plan_id, description=description)
+
     # There should only be one entry per site per plan
     # Check that this entry has a run with the correct config
     # And if not, make that run
