Merge branch 'main' into hy/bookmark_via_bookmarkmenu

Author: ben-c-at-moz

modules/page_base.py

@@ -619,13 +619,13 @@ def hide_popup(self, context_menu: str, chrome=True) -> Page:
 
         For example, the tab context menu corresponds to the id of tabContextMenu. Usage would be: tabs.hide_popup("tabContextMenu")
         """
-        script = f"""document.querySelector("#{context_menu}").hidePopup();
-        """
+        script = f'document.querySelector("#{context_menu}").hidePopup();'
         if chrome:
             with self.driver.context(self.driver.CONTEXT_CHROME):
                 self.driver.execute_script(script)
         else:
-            self.driver.execute_script(script)
+            with self.driver.context(self.driver.CONTEXT_CONTENT):
+                self.driver.execute_script(script)
 
     def hide_popup_by_class(self, class_name: str, retry=False) -> None:
         """

tests/address_bar_and_search/test_glean_basic.py

@@ -11,7 +11,7 @@
 from werkzeug.wrappers import Request, Response
 
 from modules.browser_object import Navigation
-from modules.page_object import AboutGlean, AboutPrefs
+from modules.page_object import AboutGlean, AboutPrefs, GenericPage
 from modules.util import Utilities
 
 PINGS_WITH_ID = 0
@@ -40,7 +40,7 @@ def glean_handler(rq: Request) -> Response:
             if PINGS_WITH_ID == 0:
                 engine_ground = "Google"
             else:
-                engine_ground = "DuckDuckGo"
+                engine_ground = "Bing"
             confirm_glean_correctness(
                 ping_ground=PING_ID,
                 ping_test=ping_id,
@@ -68,24 +68,23 @@ def test_glean_ping(driver: Firefox, httpserver: HTTPServer):
     about_glean.change_ping_id(ping)
 
     # Search 1 (Google)
+    page = GenericPage(driver, url="")
     nav = Navigation(driver).open()
     nav.search("trombone")
-    nav.expect_in_content(EC.title_contains("Search"))
-    nav.expect_in_content(
+    page.title_contains("Search")
+    page.expect(
         EC.presence_of_element_located((By.CSS_SELECTOR, "div[role='navigation']"))
     )
 
     # Change default search engine
     about_prefs = AboutPrefs(driver, category="search").open()
-    about_prefs.search_engine_dropdown().select_option("DuckDuckGo")
+    about_prefs.search_engine_dropdown().select_option("Bing")
 
-    # Search 2 (DDG)
+    # Search 2 (Bing)
     nav = Navigation(driver).open()
-    (
-        nav.search("trumpet")
-        .expect_in_content(EC.title_contains("DuckDuckGo"))
-        .expect_in_content(EC.visibility_of_element_located((By.ID, "more-results")))
-    )
+    nav.search("trumpet")
+    page.url_contains("bing.com")
+    page.expect(EC.visibility_of_element_located((By.ID, "b_context")))
 
     # We could go back to about:glean, but this is faster
     with driver.context(driver.CONTEXT_CHROME):

tests/language_packs/test_language_pack_install_preferences.py

@@ -1,11 +1,7 @@
-import sys
-from os import environ
-
 import pytest
 from selenium.webdriver import Firefox
 
 from modules.page_object import AboutPrefs
-from modules.util import BrowserActions
 
 LANGUAGES = [("it", "Imposta alternative")]
 

tests/preferences/test_lang_pack_changed_from_about_prefs.py

@@ -1,11 +1,5 @@
-import locale
-import logging
-from time import sleep
-
 import pytest
 from selenium.webdriver import Firefox
-from selenium.webdriver.common.keys import Keys
-from selenium.webdriver.support import expected_conditions as EC
 
 from modules.browser_object import PanelUi, TabBar, TabContextMenu, Toolbar
 from modules.page_object import AboutPrefs, GenericPage

tests/security_and_privacy/test_downloads_from_private_not_leaked.py

@@ -102,7 +102,10 @@ def test_downloads_from_private_not_leaked(driver: Firefox, delete_files, screen
             .startswith("File deleted")
         )
     )
-    context_menu.hide_popup_by_child_node("copy-download-link")
+
+    script = 'document.querySelector("#downloadsContextMenu").hidePopup();'
+    with driver.context(driver.CONTEXT_CONTENT):
+        driver.execute_script(script)
 
     # Check that nothing has leaked
     driver.switch_to.window(non_private_window)