Merge branch 'main' into Hani/cm-clarins-fr

Author: Hani Yacoub

l10n_CM/constants/fossil/FR/fossil_ad.json

@@ -0,0 +1,25 @@
+{
+  "url": "http://127.0.0.1:8080/fossil_ad.html",
+  "field_mapping": {
+    "given_name": "99a70545-7f95-4d53-97f8-bc5bf8fc639b",
+    "family_name": "b39a17aa-c511-45b0-b2bb-8c6240b27107",
+    "street_address": "f463c9aa-081b-4266-8ac2-0a2c86374c42",
+    "address_level_2": "6f9be43b-64cb-4ab7-bc58-ce19bc732b08",
+    "email": "cbf954aa-ace7-4e4d-aa64-b6bfeb437b97",
+    "country": "f5270f7d-62dd-4ee0-a4d3-104419e4cd10",
+    "postal_code": "0ab59bb3-c582-424e-a4cb-c39d0ceb9eab",
+    "telephone": "afd69703-573b-4eee-b746-4027ac4a2135"
+  },
+
+  "form_field": "*[data-moz-autofill-inspect-id='{given_name}']",
+  "fields": [
+    "99a70545-7f95-4d53-97f8-bc5bf8fc639b",
+    "b39a17aa-c511-45b0-b2bb-8c6240b27107",
+    "f463c9aa-081b-4266-8ac2-0a2c86374c42",
+    "6f9be43b-64cb-4ab7-bc58-ce19bc732b08",
+    "cbf954aa-ace7-4e4d-aa64-b6bfeb437b97",
+    "f5270f7d-62dd-4ee0-a4d3-104419e4cd10",
+    "0ab59bb3-c582-424e-a4cb-c39d0ceb9eab",
+    "afd69703-573b-4eee-b746-4027ac4a2135"
+  ]
+}

l10n_CM/constants/fossil/FR/fossil_cc.json

@@ -0,0 +1,17 @@
+{
+  "url": "http://127.0.0.1:8080/fossil_cc.html",
+  "field_mapping": {
+    "card_number": "79d06c42-b482-4e92-aa96-89e6e5fa50a4",
+    "expiration_month": "3f05f764-8536-47ed-a80b-40869070f04c",
+    "expiration_year": "4a2915b3-3f81-4bb7-907b-ec9dba2628a7",
+    "cvv": "38332785-5fce-4e51-9d6e-b201e22b07aa"
+  },
+
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "79d06c42-b482-4e92-aa96-89e6e5fa50a4",
+    "3f05f764-8536-47ed-a80b-40869070f04c",
+    "4a2915b3-3f81-4bb7-907b-ec9dba2628a7",
+    "38332785-5fce-4e51-9d6e-b201e22b07aa"
+  ]
+}

l10n_CM/region/FR.json

@@ -9,6 +9,7 @@
     "demo",
     "ebay",
     "fnac",
+    "fossil",
     "leroymerlin",
     "vans",
     "yellowkorner"

l10n_CM/run_l10n.py

@@ -52,6 +52,7 @@
     "etsy",
     "euronics",
     "fnac",
+    "fossil",
     "gapcanada",
     "giesswein",
     "helikon-tex",

l10n_CM/sites/fossil/FR/fossil_ad.html

@@ -1,5 +1,3 @@
-from platform import system
-
 import pytest
 from selenium.webdriver import Firefox
 
@@ -20,6 +18,20 @@ def test_case():
 alpenglow_map = {"light": "rgba(255, 255, 255, 0.76)", "dark": "rgba(40, 29, 78, 0.96)"}
 
 
+def colors_match(a, b):
+    """Determine if two colors are close enough to be considered matches"""
+    tolerance = 0.14
+    a_colorstring = a.split("(")[1][:-1]
+    b_colorstring = b.split("(")[1][:-1]
+    a_colors = [float(n) for n in a_colorstring.split(",")]
+    b_colors = [float(n) for n in b_colorstring.split(",")]
+    for i in range(len(a_colors)):
+        diff = abs((a_colors[i] / b_colors[i]) - 1.0)
+        if diff > tolerance:
+            return False
+    return True
+
+
 @pytest.mark.ci
 def test_redirect_to_addons(driver: Firefox):
     """
@@ -34,7 +46,6 @@ def test_redirect_to_addons(driver: Firefox):
     assert driver.current_url == "about:addons"
 
 
-@pytest.mark.skipif(system().lower().startswith("win"), reason="Bug 1974109")
 @pytest.mark.parametrize("theme_name", list(themes.keys()))
 def test_open_addons(driver: Firefox, theme_name: str):
     """
@@ -56,10 +67,12 @@ def test_open_addons(driver: Firefox, theme_name: str):
             # Already default on Firefox standard; skip activation/assertion
             pytest.skip("Compact Light is default on Firefox, skipping.")
 
-    abt_addons.activate_theme(nav, theme_name, themes[theme_name])
+    current_bg = abt_addons.activate_theme(
+        nav, theme_name, themes[theme_name], perform_assert=False
+    )
+    assert colors_match(current_bg, themes[theme_name])
 
 
-@pytest.mark.skipif(system().lower().startswith("win"), reason="Bug 1974109")
 def test_alpenglow_theme(driver: Firefox):
     """
     C118173, specifically for alpenglow theme because color can be two values for dark or light mode
@@ -72,4 +85,7 @@ def test_alpenglow_theme(driver: Firefox):
         nav, "firefox-alpenglow_mozilla_org-heading", "", perform_assert=False
     )
 
-    assert current_bg == alpenglow_map["light"] or current_bg == alpenglow_map["dark"]
+    # assert current_bg == alpenglow_map["light"] or current_bg == alpenglow_map["dark"]
+    assert colors_match(current_bg, alpenglow_map["light"]) or colors_match(
+        current_bg, alpenglow_map["dark"]
+    )