Merge branch 'main' into philimon/l10n_valid_sites_improve

Author: philimon-reset

l10n_CM/constants/cdiscount/FR/cdiscount_ad.json

@@ -0,0 +1,24 @@
+{
+  "url": "http://127.0.0.1:8080/cdiscount_ad.html",
+  "field_mapping": {
+    "given_name": "6be28779-ec7a-413e-a02a-4c52e13c4e82",
+    "family_name": "33a53ab7-94d4-4406-8b8e-f60fc41af203",
+    "address_level_2": "94555611-ca46-4468-ab4e-5795616b0fd1",
+    "street_address" : "ee3cb5a9-8100-4a31-af20-809609cdd4fb",
+    "postal_code": "48ead2a0-c336-46eb-a533-d75511f1b0f6",
+    "country" : "739b4de7-c7f2-4e9c-ade2-16a78af0dea6",
+    "telephone": "9250bcbf-33d7-4fec-87bd-9614956820cd"
+
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "6be28779-ec7a-413e-a02a-4c52e13c4e82",
+    "33a53ab7-94d4-4406-8b8e-f60fc41af203",
+    "94555611-ca46-4468-ab4e-5795616b0fd1",
+    "ee3cb5a9-8100-4a31-af20-809609cdd4fb",
+    "48ead2a0-c336-46eb-a533-d75511f1b0f6",
+    "739b4de7-c7f2-4e9c-ade2-16a78af0dea6",
+    "9250bcbf-33d7-4fec-87bd-9614956820cd"
+
+  ]
+}

l10n_CM/constants/cdiscount/FR/cdiscount_cc.json

@@ -0,0 +1,16 @@
+{
+  "url": "http://127.0.0.1:8080/cdiscount_cc.html",
+  "field_mapping": {
+    "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"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "03b45e0e-3ee5-4588-bb52-11c51280b1a1",
+    "1f545e96-cf5e-4bdd-8f70-8d307f9de357",
+    "963fd1a5-05f5-4464-adba-71c1529dc983",
+    "e9f9c0b6-2960-47f0-91ca-74b18b3f1056"
+  ]
+}

l10n_CM/constants/newbalance/DE/newbalance_ad.json

@@ -0,0 +1,22 @@
+{
+ "url": "http://127.0.0.1:8080/newbalance_ad.html",
+ "field_mapping": {
+    "given_name":"94d5b3c4-499a-49e8-80a6-284b407c14d2",
+    "family_name":"66fdc090-e5a8-42c7-8933-fc90d6a66798",
+    "street_address":"2e77b7bc-752e-48dc-98a7-42371399d3ed",
+    "address_level_2":"74403655-6c14-4f3a-bae9-4e0ac7db4c08",
+    "postal_code":"3587a8f1-2639-4cb1-94be-16db11d1f291",
+    "telephone": "36708c9a-2675-46f5-bef2-eb7e87460b8c",
+    "email": "59b9f19d-2422-40ec-b1ea-e4e557e50512"
+ },
+ "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+ "fields": [
+    "94d5b3c4-499a-49e8-80a6-284b407c14d2",
+    "66fdc090-e5a8-42c7-8933-fc90d6a66798",
+    "2e77b7bc-752e-48dc-98a7-42371399d3ed",
+    "74403655-6c14-4f3a-bae9-4e0ac7db4c08",
+    "3587a8f1-2639-4cb1-94be-16db11d1f291",
+    "36708c9a-2675-46f5-bef2-eb7e87460b8c",
+    "59b9f19d-2422-40ec-b1ea-e4e557e50512"
+ ]
+}

l10n_CM/constants/newbalance/DE/newbalance_cc.json

@@ -0,0 +1,15 @@
+{
+  "url": "http://127.0.0.1:8080/newbalance_cc.html",
+  "field_mapping": {
+    "card_number": "2f4676c4-2ce0-4a97-a0cc-fb377d836441",
+    "expiration_date": "060f9552-da63-46a8-a820-a671c185776c",
+    "cvv": "a3ee2068-148e-4b0a-a67b-f401e0930f39"
+},
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": "True",
+  "fields": [
+    "2f4676c4-2ce0-4a97-a0cc-fb377d836441",
+    "060f9552-da63-46a8-a820-a671c185776c",
+    "a3ee2068-148e-4b0a-a67b-f401e0930f39"
+]
+}

l10n_CM/run_l10n.py

@@ -30,7 +30,9 @@
     "ebay",
     "newbalance",
     "zalando",
+    "cdiscount",
     "aldoshoes",
+
 }
 
 loaded_valid_sites = valid_l10n_mappings().keys()
@@ -137,9 +139,7 @@ def get_region_tests(test_region: str) -> list[str]:
         region_data = load(fp)
         raw_tests = region_data.get("tests", [])
         return (
-            list(
-                map(lambda test: os.path.join(current_dir, "Unified", test), raw_tests)
-            )
+            list(map(lambda test: current_dir + "/Unified/" + test, raw_tests))
             if len(raw_tests) > 0
             else raw_tests
         )

l10n_CM/sites/cdiscount/FR/cdiscount_ad.html

@@ -1,6 +1,8 @@
 import re
+from time import sleep
 
 import pytest
+from selenium.common.exceptions import StaleElementReferenceException
 from selenium.webdriver import Firefox
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
@@ -19,7 +21,8 @@ def delete_files_regex_string():
     return r"\bdownload\b"
 
 
-MIXED_CONTENT_DOWNLOAD_URL = "https://b-mcb-download.glitch.me/"
+MIXED_CONTENT_DOWNLOAD_URL = "https://file-examples.com/wp-content/storage/2018/04/file_example_AVI_480_750kB.avi"
+MAX_CHECKS = 30
 
 
 def test_mixed_content_download_via_https(driver: Firefox, delete_files):
@@ -29,14 +32,10 @@ def test_mixed_content_download_via_https(driver: Firefox, delete_files):
 
     web_page = GenericPage(driver, url=MIXED_CONTENT_DOWNLOAD_URL)
 
-    # Wait up to 30 seconds for test website to wake up and load the content
+    # Wait up to 30 seconds for test website to wake up and download the content
     web_page.open()
     with driver.context(driver.CONTEXT_CHROME):
-        WebDriverWait(driver, 30).until(EC.title_contains("Hello!"))
-
-    WebDriverWait(driver, 5).until(
-        EC.presence_of_element_located((By.XPATH, "//button[@onclick='runtestSec()']"))
-    ).click()
+        WebDriverWait(driver, 30).until(EC.title_contains("File Examples"))
 
     with driver.context(driver.CONTEXT_CHROME):
         download_name = WebDriverWait(driver, 10).until(
@@ -49,12 +48,23 @@ def test_mixed_content_download_via_https(driver: Firefox, delete_files):
 
         # Verify that the desired download target element is present directly, no extra steps needed.
         download_value = download_name.get_attribute("value")
-        assert re.match(r"download(\(\d+\))?$", download_value), (
+        assert re.match(r"file_example_AVI_480_750kB(\(\d+\)).avi$", download_value), (
             f"The download name is incorrect: {download_value}"
         )
 
         # Verify that the download progress has reached 100%, which indicates that the download is complete.
-        download_status_value = download_status.get_attribute("value")
-        assert download_status_value == "100", (
-            f"The download status is not '100': {download_status_value}"
-        )
+        i = 1
+        while True:
+            try:
+                download_value = download_status.get_attribute("value")
+                if download_value == "100":
+                    break
+            except StaleElementReferenceException:
+                pass
+
+            if i > MAX_CHECKS:
+                raise TimeoutError(
+                    "Download progress did not reach 100% within reasonable time."
+                )
+            sleep(1)
+            i = +1