Merge branch 'main' into anca/cm-cleanup

Author: soncuteanca

l10n_CM/constants/gapcanada/CA/gapcanada_ad.json

@@ -0,0 +1,19 @@
+{
+  "url": "http://127.0.0.1:8080/gapcanada_ad.html",
+  "field_mapping": {
+    "name": "c2f93d9b-89f2-4ddd-b65f-253ebb30ba48",
+    "street_address": "394bd19c-d1a5-4e1b-9293-9808291517d9",
+    "address_level_2": "62abf981-6478-44bd-9391-a16460552444",
+    "postal_code": "ff8206c2-2a7d-42a3-bcea-c0c4567c6fb3",
+    "telephone": "cdb38050-4b23-4abc-bcfe-528fc1641da8"
+  },
+
+  "form_field": "*[data-moz-autofill-inspect-id='{given_name}']",
+  "fields": [
+    "c2f93d9b-89f2-4ddd-b65f-253ebb30ba48",
+    "394bd19c-d1a5-4e1b-9293-9808291517d9",
+    "62abf981-6478-44bd-9391-a16460552444",
+    "ff8206c2-2a7d-42a3-bcea-c0c4567c6fb3",
+    "cdb38050-4b23-4abc-bcfe-528fc1641da8"
+  ]
+}

l10n_CM/constants/gapcanada/CA/gapcanada_cc.json

@@ -0,0 +1,15 @@
+{
+  "url": "http://127.0.0.1:8080/gapcanada_cc.html",
+  "field_mapping": {
+    "card_number": "c9e8eb6a-d1bd-4385-a0a1-60f9cd67a230",
+    "expiration_date": "a340db3d-08ab-47b3-aa76-1a97f6ff2f9b",
+    "cvv": "3726fd34-acd2-4565-8160-0cad2577faf3"
+  },
+
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "c9e8eb6a-d1bd-4385-a0a1-60f9cd67a230",
+    "a340db3d-08ab-47b3-aa76-1a97f6ff2f9b",
+    "3726fd34-acd2-4565-8160-0cad2577faf3"
+  ]
+}

l10n_CM/region/CA.json

@@ -8,6 +8,7 @@
     "demo",
     "ebay",
     "etsy",
+    "gapcanada"
     "movieposters",
     "newbalance",
     "staples",

l10n_CM/run_l10n.py

@@ -40,6 +40,7 @@
     "etsy",
     "euronics",
     "fnac",
+    "gapcanada",
     "giesswein",
     "hofer",
     "holzkern",
@@ -65,7 +66,7 @@
     "yellowkorner",
     "zalando",
     "zara",
-    "zooplus",
+    "zooplus"
 }
 
 loaded_valid_sites = valid_l10n_mappings().keys()

l10n_CM/sites/gapcanada/CA/gapcanada_ad.html

@@ -1,10 +1,11 @@
+from platform import system
+
 import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object import Navigation
 from modules.page_object import AboutPrefs
 
-WAIT_TIMEOUT = 10
 SEARCH_ENGINE = "DuckDuckGo"
 EXPECTED_PLACEHOLDER = f"Search with {SEARCH_ENGINE} or enter address"
 
@@ -14,7 +15,7 @@ def test_case():
     return "3028795"
 
 
-@pytest.mark.unstable(reason="Bug 1983836")
+@pytest.mark.skipif(system().lower().startswith("win"), reason="Bug 1983836")
 @pytest.mark.ci
 def test_default_search_provider_change_awesome_bar(driver: Firefox):
     """

l10n_CM/sites/gapcanada/CA/gapcanada_cc.html

@@ -28,7 +28,6 @@ def add_to_prefs_list():
     return [("services.sync.prefs.sync-seen.intl.accept_languages", True)]
 
 
-@pytest.mark.unstable(reason="Bug 1978598")
 def test_lang_pack_changed_from_about_prefs(driver: Firefox):
     """
     C1771617 - The language can be changed in about:preferences.

tests/address_bar_and_search/test_default_search_provider_change_awesome_bar.py

@@ -28,7 +28,6 @@ def delete_files_regex_string():
     return r"opm.*\.pdf"
 
 
-@pytest.mark.unstable(reason="Bug 1983849")
 @pytest.mark.slow
 @pytest.mark.audio
 def test_downloads_from_private_not_leaked(driver: Firefox, delete_files, screenshot):

tests/preferences/test_lang_pack_changed_from_about_prefs.py

@@ -9,7 +9,10 @@ def suite_id():
 @pytest.fixture()
 def prefs_list(add_to_prefs_list: dict):
     """List of prefs to send to main conftest.py driver fixture"""
-    prefs = [("browser.tabs.delayHidingAudioPlayingIconMS", "200")]
+    prefs = [
+        ("browser.tabs.delayHidingAudioPlayingIconMS", "200"),
+        ("browser.toolbars.bookmarks.visibility", "always"),
+    ]
     prefs.extend(add_to_prefs_list)
     return prefs