move chromium_options to conftest.py

Author: navin772

py/conftest.py

@@ -370,3 +370,29 @@ def firefox_options(request):
     if request.config.option.headless:
         options.add_argument("-headless")
     return options
+
+
+@pytest.fixture
+def chromium_options(request):
+    try:
+        driver_option = request.config.option.drivers[0].lower()
+    except (AttributeError, TypeError):
+        raise Exception("This test requires a --driver to be specified")
+
+    # Skip if not Chrome or Edge
+    if driver_option not in ("chrome", "edge"):
+        pytest.skip(f"This test requires Chrome or Edge, got {driver_option}")
+
+    # skip tests in the 'remote' directory if run with a local driver
+    if request.node.path.parts[-2] == "remote" and get_driver_class(driver_option) != "Remote":
+        pytest.skip(f"Remote tests can't be run with driver '{driver_option}'")
+
+    if driver_option == "chrome":
+        options = webdriver.ChromeOptions()
+    elif driver_option == "edge":
+        options = webdriver.EdgeOptions()
+
+    if request.config.option.headless:
+        options.add_argument("--headless=new")
+
+    return options

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

@@ -23,9 +23,7 @@
 from python.runfiles import Runfiles
 
 from selenium import webdriver
-from selenium.webdriver.chrome.options import Options as ChromeOptions
 from selenium.webdriver.common.by import By
-from selenium.webdriver.edge.options import Options as EdgeOptions
 from selenium.webdriver.support.wait import WebDriverWait
 
 EXTENSION_ID = "[email protected]"
@@ -123,31 +121,29 @@ def pages_chromium(self, webserver, chromium_driver):
         class Pages:
             def load(self, name):
                 chromium_driver.get(webserver.where_is(name, localhost=False))
+
         return Pages()
 
     @pytest.fixture
-    def chromium_driver(self, request):
+    def chromium_driver(self, chromium_options, request):
+        """Create a Chrome/Edge driver with webextension support enabled."""
         driver_option = request.config.option.drivers[0].lower()
 
         if driver_option == "chrome":
-            options = ChromeOptions()
             browser_class = webdriver.Chrome
         elif driver_option == "edge":
-            options = EdgeOptions()
             browser_class = webdriver.Edge
-        else:
-            pytest.skip(f"This test requires Chrome or Edge, got {driver_option}")
 
         temp_dir = tempfile.mkdtemp()
 
-        options.enable_bidi = True
-        options.enable_webextensions = True
-        options.add_argument(f"--user-data-dir={temp_dir}")
+        chromium_options.enable_bidi = True
+        chromium_options.enable_webextensions = True
+        chromium_options.add_argument(f"--user-data-dir={temp_dir}")
 
-        driver = browser_class(options=options)
+        chromium_driver = browser_class(options=chromium_options)
 
-        yield driver
-        driver.quit()
+        yield chromium_driver
+        chromium_driver.quit()
 
     def test_install_extension_path(self, chromium_driver, pages_chromium):
         """Test installing an extension from a directory path."""