Merge branch 'main' into philimon/l10n_reporting_part_1

Author: philimon-reset

tests/address_bar_and_search/test_search_suggestions.py

@@ -9,7 +9,7 @@
 
 # Constants
 SEARCH_TERM_SPONSORED = "iphone"
-SEARCH_TERM_NON_SPONSORED = "wiki"
+SEARCH_TERM_NON_SPONSORED = "wikimedia"
 RETRY_LIMIT = 5
 SECONDS = 3
 
@@ -72,5 +72,5 @@ def test_search_suggests_enabled(driver: Firefox):
     with driver.context(driver.CONTEXT_CHROME):
         nav.get_element("firefox-suggest")
         titles = nav.get_elements("suggestion-titles")
-        found_non_sponsored = any("wikipedia" in title.text for title in titles)
+        found_non_sponsored = any("Wikipedia" in title.text for title in titles)
     assert found_non_sponsored, "Non-sponsored suggestion not found"

tests/preferences/test_clear_cookie_data.py

@@ -10,6 +10,13 @@ def test_case():
     return "143627"
 
 
+def open_clear_cookies_data_dialog(about_prefs: AboutPrefs, ba: BrowserActions):
+    about_prefs.open()
+    clear_data_popup = about_prefs.press_button_get_popup_dialog_iframe("Clear Data")
+    ba.switch_to_iframe_context(clear_data_popup)
+    return about_prefs.get_clear_cookie_data_value()
+
+
 def test_clear_cookie_data(driver: Firefox):
     """
     C143627: Cookies and site data can be cleared via the "Clear Data" panel
@@ -18,27 +25,18 @@ def test_clear_cookie_data(driver: Firefox):
     about_prefs = AboutPrefs(driver, category="privacy")
     ba = BrowserActions(driver)
 
-    def open_clear_cookies_data_dialog():
-        about_prefs.open()
-        clear_data_popup = about_prefs.press_button_get_popup_dialog_iframe(
-            "Clear Data"
-        )
-        ba.switch_to_iframe_context(clear_data_popup)
-
     # Visit a site to get a cookie added to saved data
-    driver.get("https://www.firefox.com")
+    driver.get("https://www.wikipedia.com")
 
     # Navigate to the clear data dialog of about:preferences#privacy
-    open_clear_cookies_data_dialog()
-
     # Check for a non-zero value of the 'Cookies and site data' option
-    cookie_value = about_prefs.get_clear_cookie_data_value()
+    cookie_value = open_clear_cookies_data_dialog(about_prefs, ba)
     assert cookie_value > 0
 
     # Then clear the cookies and site data
     about_prefs.get_element("clear-data-accept-button").click()
 
     # Finally, check the value of the dialog option, it should be 0
-    open_clear_cookies_data_dialog()
-    cookie_value2 = about_prefs.get_clear_cookie_data_value()
+
+    cookie_value2 = open_clear_cookies_data_dialog(about_prefs, ba)
     assert cookie_value2 == 0