Merge branch 'trunk' into java_bidi_emulation

Author: Delta456

common/selenium_manager.bzl

@@ -6,22 +6,22 @@ def selenium_manager():
     http_file(
         name = "download_sm_linux",
         executable = True,
-        sha256 = "50099355b0e74b8bb231a5b152fc3de498dcde1cdebcefb1e501713e9b124b9d",
-        url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-0ab9b6d/selenium-manager-linux",
+        sha256 = "f615ae2eea714a54e322f8945c7abb19e03e0f5d651b464bd5cd9e9ecf9e7c90",
+        url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-9d09338/selenium-manager-linux",
     )
 
     http_file(
         name = "download_sm_macos",
         executable = True,
-        sha256 = "eb98ce344acfaee3a7d58038331a8b49985ac724d2a9ec02258008c076979846",
-        url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-0ab9b6d/selenium-manager-macos",
+        sha256 = "88fede46d14991930aab3176f6938ddb7549ab244f6d75a9745050d625274852",
+        url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-9d09338/selenium-manager-macos",
     )
 
     http_file(
         name = "download_sm_windows",
         executable = True,
-        sha256 = "7090d5737aebabb9daad49022b070d3456b8e43ae7f3ac5bcb780af67c371b3f",
-        url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-0ab9b6d/selenium-manager-windows.exe",
+        sha256 = "a7e8a7e0f561e7d8238f8aa884ef2dd6235884d3b0e97f25061747dbf4ec5037",
+        url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-9d09338/selenium-manager-windows.exe",
     )
 
 def _selenium_manager_artifacts_impl(_ctx):

py/test/selenium/webdriver/common/bidi_webextension_tests.py

@@ -132,18 +132,30 @@ def chromium_driver(self, chromium_options, request):
 
         if driver_option == "chrome":
             browser_class = webdriver.Chrome
+            browser_service = webdriver.ChromeService
         elif driver_option == "edge":
             browser_class = webdriver.Edge
+            browser_service = webdriver.EdgeService
 
-        temp_dir = tempfile.mkdtemp(prefix="chrome-profile-")
+        temp_dir = tempfile.mkdtemp(prefix="chromium-profile-")
 
         chromium_options.enable_bidi = True
         chromium_options.enable_webextensions = True
         chromium_options.add_argument(f"--user-data-dir={temp_dir}")
         chromium_options.add_argument("--no-sandbox")
         chromium_options.add_argument("--disable-dev-shm-usage")
 
-        chromium_driver = browser_class(options=chromium_options)
+        binary = request.config.option.binary
+        if binary:
+            chromium_options.binary_location = binary
+
+        executable = request.config.option.executable
+        if executable:
+            service = browser_service(executable_path=executable)
+        else:
+            service = browser_service()
+
+        chromium_driver = browser_class(options=chromium_options, service=service)
 
         yield chromium_driver
         chromium_driver.quit()