[py] Move headless option to fixture

Author: cgoldberg

py/conftest.py

@@ -398,5 +398,8 @@ def clean_driver(request):
 
 
 @pytest.fixture
-def headless(request):
-    return request.config.option.headless
+def firefox_options(request):
+    options = webdriver.FirefoxOptions()
+    if request.config.option.headless:
+        options.add_argument("-headless")
+    return options

py/test/selenium/webdriver/firefox/firefox_sizing_tests.py

@@ -22,34 +22,27 @@
 import pytest
 
 from selenium import webdriver
-from selenium.webdriver.firefox.options import Options
 
 
 def is_running_wayland():
     return platform.system() == "Linux" and os.getenv("WAYLAND_DISPLAY")
 
 
 @pytest.mark.skipif(not is_running_wayland(), reason="This test only runs on Linux under Wayland")
-def test_firefox_opens_large_when_running_xwayland(headless):
+def test_firefox_opens_large_when_running_xwayland(firefox_options):
     # setting environment variable `MOZ_ENABLE_WAYLAND=0` forces Firefox
     # to run under XWayland on Wayland based systems
     with patch.dict("os.environ", {"MOZ_ENABLE_WAYLAND": "0"}):
-        options = Options()
-        if headless:
-            options.add_argument("-headless")
-        with webdriver.Firefox(options=options) as driver:
+        with webdriver.Firefox(options=firefox_options) as driver:
             size = driver.get_window_size()
             assert size["height"] > 500
             assert size["width"] > 500
 
 
 @pytest.mark.skipif(not is_running_wayland(), reason="This test only runs on Linux under Wayland")
 @pytest.mark.xfail(reason="https://bugzilla.mozilla.org/show_bug.cgi?id=1959040")
-def test_firefox_opens_large_when_running_wayland(headless):
-    options = Options()
-    if headless:
-        options.add_argument("-headless")
-    with webdriver.Firefox(options=options) as driver:
+def test_firefox_opens_large_when_running_wayland(firefox_options):
+    with webdriver.Firefox(options=firefox_options) as driver:
         size = driver.get_window_size()
         assert size["height"] > 500
         assert size["width"] > 500

py/test/selenium/webdriver/remote/remote_custom_locator_tests.py

@@ -18,7 +18,6 @@
 import pytest
 
 from selenium import webdriver
-from selenium.webdriver.firefox.options import Options
 from selenium.webdriver.remote.locator_converter import LocatorConverter
 
 
@@ -31,15 +30,10 @@ def convert(self, by, value):
 
 
 @pytest.fixture()
-def custom_locator_driver(headless):
-    options = Options()
-    if headless:
-        options.add_argument("-headless")
-    try:
-        driver = webdriver.Remote(options=options, locator_converter=CustomLocatorConverter())
-        yield driver
-    finally:
-        driver.quit()
+def custom_locator_driver(firefox_options):
+    driver = webdriver.Remote(options=firefox_options, locator_converter=CustomLocatorConverter())
+    yield driver
+    driver.quit()
 
 
 def test_find_element_with_custom_locator(custom_locator_driver):

py/test/selenium/webdriver/remote/remote_firefox_profile_tests.py

@@ -17,15 +17,11 @@
 
 from selenium import webdriver
 from selenium.webdriver.firefox.firefox_profile import FirefoxProfile
-from selenium.webdriver.firefox.options import Options
 
 
-def test_profile_is_used(headless):
+def test_profile_is_used(firefox_options):
     ff_profile = FirefoxProfile()
     ff_profile.set_preference("browser.startup.page", "1")
-    options = Options()
-    options.profile = ff_profile
-    if headless:
-        options.add_argument("-headless")
-    with webdriver.Remote(options=options) as driver:
+    firefox_options.profile = ff_profile
+    with webdriver.Remote(options=firefox_options) as driver:
         assert "browser/content/blanktab.html" in driver.current_url