Merge branch 'main' into anca/cm-us-apple

Author: soncuteanca

l10n_CM/constants/yellowkorner/FR/yellowkorner_ad.json

@@ -0,0 +1,25 @@
+{
+  "url": "http://127.0.0.1:8080/yellowkorner_ad.html",
+  "field_mapping": {
+    "given_name": "5960cb79-1aab-4074-ae3c-764685328505",
+    "family_name": "030cb327-9c72-4617-8a63-aa39b886ba6c",
+    "street_address": "834b799a-5d7b-41f2-9ba0-3fe6796e34b2",
+    "address_level_2": "7f25e3a1-4160-4d19-b2c3-9b449d7aba9d",
+    "country": "d3b5f197-a1a1-49e3-ad6e-a7019131fd19",
+    "postal_code": "26148b36-0fc4-4c51-aef1-4636168b65a5",
+    "telephone": "e5aea163-2e59-4db5-a78f-f3a799ea07ed",
+    "email": "df9be921-33a5-446c-afc3-8526f6205031"
+  },
+
+  "form_field": "*[data-moz-autofill-inspect-id='{given_name}']",
+  "fields": [
+    "5960cb79-1aab-4074-ae3c-764685328505",
+    "030cb327-9c72-4617-8a63-aa39b886ba6c",
+    "834b799a-5d7b-41f2-9ba0-3fe6796e34b2",
+    "7f25e3a1-4160-4d19-b2c3-9b449d7aba9d",
+    "d3b5f197-a1a1-49e3-ad6e-a7019131fd19",
+    "26148b36-0fc4-4c51-aef1-4636168b65a5",
+    "e5aea163-2e59-4db5-a78f-f3a799ea07ed",
+    "df9be921-33a5-446c-afc3-8526f6205031"
+  ]
+}

l10n_CM/constants/yellowkorner/FR/yellowkorner_cc.json

@@ -0,0 +1,17 @@
+{
+  "url": "http://127.0.0.1:8080/yellowkorner_cc.html",
+  "field_mapping": {
+    "card_name": "78acaa43-767a-4b0c-9f33-843a69bbb513",
+    "card_number": "5e681607-501f-4b81-a250-5de8fe10981e",
+    "expiration_date": "bf493d87-1b04-4068-bd84-da672a2eb33a",
+    "cvv": "c77b687d-b39c-4046-88d7-a5340f9ad980"
+},
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": "True",
+  "fields": [
+    "78acaa43-767a-4b0c-9f33-843a69bbb513",
+    "5e681607-501f-4b81-a250-5de8fe10981e",
+    "bf493d87-1b04-4068-bd84-da672a2eb33a",
+    "c77b687d-b39c-4046-88d7-a5340f9ad980"
+]
+}

l10n_CM/region/FR.json

@@ -3,7 +3,8 @@
   "sites": [
     "amazon",
     "demo",
-    "artsper"
+    "artsper",
+    "yellowkorner"
   ],
   "tests": [
   ]

l10n_CM/run_l10n.py

@@ -35,15 +35,17 @@
     "aldoshoes",
     "canadatire",
     "apple",
-    "wish",
     "artsper",
+    "yellowkorner"
+    "wish"
 }
 
 loaded_valid_sites = valid_l10n_mappings().keys()
 valid_sites = valid_sites.union(set(loaded_valid_sites))
 
 live_sites = []
 
+
 LOCALHOST = "127.0.0.1"
 PORT = 8080
 os.environ["TEST_EXIT_CODE"] = "0"

l10n_CM/sites/yellowkorner/FR/yellowkorner_ad.html

@@ -392,7 +392,12 @@ def organize_l10n_entries(
         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, "duration": f"{duration}s"}
+            {
+                "suite_id": suite_id,
+                "site": site,
+                "test_case": test_case,
+                "duration": f"{duration}s",
+            }
         )
 
     return test_results

l10n_CM/sites/yellowkorner/FR/yellowkorner_cc.html

@@ -1,3 +1,5 @@
+from time import sleep
+
 import pytest
 from selenium.webdriver import Firefox
 
@@ -23,6 +25,7 @@ def test_auto_saved_generated_password_context_menu(driver: Firefox):
     """
     C2248176 - Securely Generated Password is auto-saved when generated from password field context menu
     """
+
     # Instantiate objects
     context_menu = ContextMenu(driver)
     tabs = TabBar(driver)
@@ -37,14 +40,25 @@ def test_auto_saved_generated_password_context_menu(driver: Firefox):
     context_menu.click_and_hide_menu("context-menu-suggest-strong-password")
 
     # Select "Use a Securely Generated Password" in password field and check the "Update password" doorhanger
-    # is displayed
     with driver.context(driver.CONTEXT_CHROME):
         login_autofill.get_element("generated-securely-password").click()
+
+    # Wait for password field to actually get filled
+    login_autofill.expect(
+        lambda _: login_autofill.get_element("password-login-field").get_attribute(
+            "value"
+        )
+        != ""
+    )
+
+    # Verify the update doorhanger is displayed
+    with driver.context(driver.CONTEXT_CHROME):
+        sleep(3)
         nav.click_on("password-notification-key")
-        update_doorhanger = autofill_popup_panel.get_element(
-            "password-update-doorhanger"
+        autofill_popup_panel.expect(
+            lambda _: UPDATE_DOORHANGER_TEXT
+            in autofill_popup_panel.get_element("password-update-doorhanger").text
         )
-        assert update_doorhanger.text == UPDATE_DOORHANGER_TEXT
 
     # Navigate to about:logins page
     tabs.switch_to_new_tab()

modules/testrail_integration.py

@@ -28,7 +28,6 @@ def add_to_prefs_list():
     return [("services.sync.prefs.sync-seen.intl.accept_languages", True)]
 
 
-@pytest.mark.skipif(system().lower().startswith("win"), reason="Bug 1978595")
 def test_lang_pack_changed_from_about_prefs(driver: Firefox):
     """
     C1771617 - The language can be changed in about:preferences.
@@ -69,6 +68,12 @@ def test_lang_pack_changed_from_about_prefs(driver: Firefox):
     screen_cap = GenericPage(driver, url=SCREEN_CAP_URL)
     screen_cap.open()
     screen_cap.find_element("id", "start").click()
+
+    # In automation, Windows is putting the popup behind the browser window.
+    # A click in the awesomebar magically makes the popup visible.
+    if system() == "Windows":
+        nav.click_in_awesome_bar()
+
     nav.element_visible("popup-notification")
     nav.expect_element_attribute_contains(
         "popup-notification", "label", SCREEN_CAP_LABEL_FRONT_PT

tests/password_manager/test_auto_saved_generated_password_context_menu.py

@@ -17,14 +17,15 @@ def test_active_tab(driver: Firefox):
     tabs = TabBar(driver)
     num_tabs = 5
 
-    # opening 5 tabs
+    # Open 5 tabs
     for i in range(num_tabs):
         tabs.new_tab_by_button()
 
-    # go through all the tabs and ensure highlighted one is correct, +2 since 1 indexed and additional tab for the beginning
+    # Go through all the tabs and ensure the focus is correct
     for i in range(1, num_tabs + 2):
-        target_tab = tabs.get_tab(i)
         with driver.context(driver.CONTEXT_CHROME):
+            target_tab = tabs.get_tab(i)
             target_tab.click()
-            visibility = target_tab.get_attribute("visuallyselected")
-            assert visibility == ""
+            tabs.custom_wait(timeout=3).until(
+                lambda d: target_tab.get_attribute("visuallyselected") == ""
+            )