Merge branch 'main' into anca/cm-de-thomann

Author: soncuteanca

l10n_CM/README.md

@@ -65,6 +65,9 @@ The harness relies on several configuration files:
   ],
   # list of individual tests to skip for this configuration run.
   "skipped": []
+  # list of OS platforms to skip for this configuration run.
+  # "Darwin", "Linux" or "Windows"
+  "skip_os": []
 }
 
 ```

l10n_CM/constants/wish/US/wish_ad.json

@@ -0,0 +1,24 @@
+{
+  "url": "http://127.0.0.1:8080/wish_ad.html",
+  "field_mapping": {
+    "family_name": "85068eda-75f5-4319-b897-becd3a1b1b22",
+    "given_name": "3cab3b5e-1944-4112-af77-75a4f3ca238d",
+    "address_level_2": "0408ab06-bf6d-4aae-b73c-58e314183732",
+    "address_level_1": "5dee3d64-dab7-4848-895c-6ecb016547fb",
+    "street_address" : "a6db6fea-94a1-4a7f-addd-436a4b2ba270",
+    "postal_code": "be69366f-f2b1-4502-90af-cdc56069af11",
+    "telephone": "22bcc5a1-f1d3-4a97-949a-6868448e9c17"
+
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "85068eda-75f5-4319-b897-becd3a1b1b22",
+    "3cab3b5e-1944-4112-af77-75a4f3ca238d",
+    "0408ab06-bf6d-4aae-b73c-58e314183732",
+    "5dee3d64-dab7-4848-895c-6ecb016547fb",
+    "a6db6fea-94a1-4a7f-addd-436a4b2ba270",
+    "be69366f-f2b1-4502-90af-cdc56069af11",
+    "22bcc5a1-f1d3-4a97-949a-6868448e9c17"
+
+  ]
+}

l10n_CM/constants/wish/US/wish_cc.json

@@ -0,0 +1,16 @@
+{
+  "url": "http://127.0.0.1:8080/wish_cc.html",
+  "field_mapping": {
+    "card_number": "6e530a2b-9ee5-489a-8ce3-68f014a3bb27",
+    "expiration_date": "dbc81cc7-75dc-454f-b4e4-eaf40f956bce",
+    "cvv": "4e2ac2c7-ef80-43b1-bab7-50da89d54acb"
+},
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": true,
+  "fields": [
+    "6e530a2b-9ee5-489a-8ce3-68f014a3bb27",
+    "dbc81cc7-75dc-454f-b4e4-eaf40f956bce",
+    "4e2ac2c7-ef80-43b1-bab7-50da89d54acb"
+]
+
+}

l10n_CM/region/US.json

@@ -9,7 +9,8 @@
     "bestbuy",
     "demo",
     "newegg",
-    "aldoshoes"
+    "aldoshoes",
+    "wish"
   ],
   "tests": []
 }

l10n_CM/run_l10n.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import platform
 import subprocess
 import sys
 import threading
@@ -34,6 +35,7 @@
     "aldoshoes",
     "canadatire",
     "thomann",
+    "wish",
     "artsper",
 }
 
@@ -42,7 +44,6 @@
 
 live_sites = []
 
-
 LOCALHOST = "127.0.0.1"
 PORT = 8080
 os.environ["TEST_EXIT_CODE"] = "0"
@@ -189,15 +190,17 @@ def should_keep_test(test):
 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.
+    It is either a list of tests to skip or skipping all tests for the given site.
 
     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:
+    with open(os.path.join(current_dir, "constants", live_site) + ".json", "r") as fp:
         live_site_data = load(fp)
-        if live_site_data.get("skip"):
+        platform_skip = platform.system() in live_site_data.get("skip_os", [])
+        if live_site_data.get("skip") or platform_skip:
             return "All"
         return live_site_data.get("skipped", [])
 

l10n_CM/sites/wish/US/wish_ad.html

@@ -0,0 +1 @@
+<div class="Common__InfoWrapper-bon6ls-0 hXGwiH"><div class="Common__Title-bon6ls-2 fltZgm">Shipping</div><div class="Common__Wrapper-bon6ls-17 hctQYm" height="570.7999877929688"><div><div class="Common__MultipleShippingWrapper-bon6ls-40 eKePTm"><div class="FormElement__FormContent-h7mauq-9 eMuqID"><div class="FormElement__FormElementTitle-h7mauq-1 cfkeTg">New Address</div><div class="FormElement__FormBody-h7mauq-19 krIguT"><div class="FormElement__FormRow-h7mauq-20 jpHihr"><div class="FormElement__FormRowEntry-h7mauq-22 bfdzNa"><div class="WishTextInput__Wrapper-molq32-0 kqbtqL"><div class="FormElement__FormElementTitle-h7mauq-1 itcIgP">First Name*</div><div class="WishTextInput__InputWrapper-molq32-4 cQLdvm"><input autocomplete="given-name" class="WishTextInput-molq32-5 kwzpzy" data-id="firstName" data-moz-autofill-inspect-id="3cab3b5e-1944-4112-af77-75a4f3ca238d" data-moz-autofill-type="given-name" id="firstName" inputmode="text" maxlength="99" placeholder="" type="text" value=""></div></div></div><div class="FormElement__FormRowEntry-h7mauq-22 bfdzNa"><div class="WishTextInput__Wrapper-molq32-0 kqbtqL"><div class="FormElement__FormElementTitle-h7mauq-1 itcIgP">Last Name*</div><div class="WishTextInput__InputWrapper-molq32-4 cQLdvm"><input autocomplete="family-name" class="WishTextInput-molq32-5 kwzpzy" data-id="lastName" data-moz-autofill-inspect-id="85068eda-75f5-4319-b897-becd3a1b1b22" data-moz-autofill-type="family-name" id="lastName" inputmode="text" maxlength="99" placeholder="" type="text" value=""></div></div></div></div><div class="FormElement__FormRow-h7mauq-20 jpHihr"><div class="FormElement__FormRowEntry-h7mauq-22 bfdzNa"><div class="FormElement__FormElementTitle-h7mauq-1 itcIgP">Address Line 1*</div><div class="WishTextInput__InputWrapper-molq32-4 cQLdvm"><input autocomplete="address-line1" class="WishTextInput-molq32-5 kwzpzy" data-id="addressLineOne" data-moz-autofill-inspect-id="a6db6fea-94a1-4a7f-addd-436a4b2ba270" data-moz-autofill-type="address-line1" id="addressLineOne" inputmode="text" maxlength="199" placeholder="" type="text" value=""></div></div></div><div class="FormElement__FormRow-h7mauq-20 jpHihr"><div class="FormElement__FormRowEntry-h7mauq-22 bfdzNa"><div class="FormElement__FormElementTitle-h7mauq-1 itcIgP">Address Line 2</div><div class="WishTextInput__InputWrapper-molq32-4 cQLdvm"><input autocomplete="address-line2" class="WishTextInput-molq32-5 kwzpzy" data-id="addressLineTwo" data-moz-autofill-inspect-id="e8ca8d13-d44c-4aec-94a4-6ba648448778" data-moz-autofill-type="address-line2" id="addressLineTwo" inputmode="text" maxlength="199" placeholder="Optional" type="text" value=""></div></div></div><div class="FormElement__FormRow-h7mauq-20 jpHihr"><div class="FormElement__FormRowEntry-h7mauq-22 bfdzNa"><div class="FormElement__FormElementTitle-h7mauq-1 fqJTbh">Country / Region*</div><div class="DropdownSelectInput__SelectBox-sc-1ssquc7-1 cutZI" role="listbox" tabindex="0" width="100%"><div class="DropdownSelectInput__SelectBoxText-sc-1ssquc7-0 jBTMEu">United Kingdom (Great Britain)</div></div><input class="FormElement__FormDummyInput-h7mauq-24 hStClv" data-moz-autofill-type="country" data-moz-autofill-inspect-id="5769e933-02cf-473e-9437-d8138611a872" id="country"></div></div><div class="FormElement__FormRow-h7mauq-20 jpHihr"><div class="FormElement__FormRowEntry-h7mauq-22 bfdzNa"><div class="FormElement__FormElementTitle-h7mauq-1 itcIgP">State/Province/Region</div><div class="WishTextInput__InputWrapper-molq32-4 cQLdvm"><input autocomplete="address-level1" class="WishTextInput-molq32-5 kwzpzy" data-id="state" data-moz-autofill-inspect-id="5dee3d64-dab7-4848-895c-6ecb016547fb" data-moz-autofill-type="address-level1" id="state" inputmode="text" maxlength="99" placeholder="Optional" type="text" value=""></div></div></div><div class="FormElement__FormRow-h7mauq-20 jpHihr"><div class="FormElement__FormRowEntry-h7mauq-22 bfdzNa"><div class="FormElement__FormElementTitle-h7mauq-1 itcIgP">City*</div><div class="WishTextInput__InputWrapper-molq32-4 cQLdvm"><input autocomplete="address-level2" class="WishTextInput-molq32-5 kwzpzy" data-id="city" data-moz-autofill-inspect-id="0408ab06-bf6d-4aae-b73c-58e314183732" data-moz-autofill-type="address-level2" id="city" inputmode="text" maxlength="99" placeholder="" type="text" value=""></div></div><div class="FormElement__FormRowEntry-h7mauq-22 bfdzNa"><div class="FormElement__FormElementTitle-h7mauq-1 itcIgP">Zip/Postal Code*</div><div class="WishTextInput__InputWrapper-molq32-4 cQLdvm"><input autocomplete="postal-code" class="WishTextInput-molq32-5 kwzpzy" data-id="zipcode" data-moz-autofill-inspect-id="be69366f-f2b1-4502-90af-cdc56069af11" data-moz-autofill-type="postal-code" id="zipcode" inputmode="text" maxlength="49" placeholder="" type="text" value=""></div></div></div><div class="FormElement__FormRow-h7mauq-20 jpHihr"><div class="FormElement__FormRowEntry-h7mauq-22 bfdzNa"><div class="FormElement__FormElementTitle-h7mauq-1 itcIgP">Phone Number*</div><div class="WishTextInput__InputWrapper-molq32-4 cQLdvm"><input autocomplete="tel" class="WishTextInput-molq32-5 kwzpzy" data-id="phoneNumber" data-moz-autofill-inspect-id="22bcc5a1-f1d3-4a97-949a-6868448e9c17" data-moz-autofill-type="tel" id="phoneNumber" inputmode="text" maxlength="49" placeholder="" type="text" value=""></div></div></div></div></div><div class="Common__MultipleShippingFormButtonGroup-bon6ls-41 dUuJGK"><div class="Common__MultipleShippingFormButtonWrapper-bon6ls-42 itPoBY"><div class="Button-sc-1r40802-0 dABSHV">Cancel</div></div><div class="Common__MultipleShippingFormButtonWrapper-bon6ls-42 itPoBY"><div class="Button-sc-1r40802-0 dABSHV">Save Address</div></div></div></div></div></div></div>

l10n_CM/sites/wish/US/wish_cc.html

@@ -290,6 +290,7 @@ def organize_l10n_entries(
     cases_in_suite = suite_info.get("cases")
     cases_in_suite = [int(n) for n in cases_in_suite]
     results = suite_info.get("results")
+    durations = suite_info.get("durations")
     plan_title = expected_plan.get("name")
 
     site_entries = [
@@ -380,16 +381,18 @@ def organize_l10n_entries(
         "blocked": {},
     }
 
-    for test_case, outcome in results.items():
-        logging.info(f"{test_case}: {outcome}")
+    for test_case in results.keys():
+        outcome = results[test_case]
+        duration = durations[test_case]
+        logging.info(f"{test_case}: {outcome} {duration}")
         if outcome == "rerun":
             logging.info("Rerun result...skipping...")
             continue
         category = next(status for status in passkey if outcome in passkey.get(status))
         if not test_results[category].get(run_id):
             test_results[category][run_id] = []
         test_results[category][run_id].append(
-            {"suite_id": suite_id, "site": site, "test_case": test_case}
+            {"suite_id": suite_id, "site": site, "test_case": test_case, "duration": f"{duration}s"}
         )
 
     return test_results