Merge branch 'trunk' into refactor

Author: sandeepsuryaprasad

py/conftest.py

@@ -229,9 +229,16 @@ def options(self, cls_name):
         if cls_name.lower() not in self._supported_options:
             raise AttributeError(f"Invalid Options class {cls_name.lower()}")
         self._options = getattr(webdriver, getattr(self._supported_options, cls_name.lower()))()
+        if self.driver_class == self._supported_drivers.firefox:
+            # There are issues with window size/position when running Firefox
+            # under Wayland, so we use XWayland instead.
+            os.environ["MOZ_ENABLE_WAYLAND"] = "0"
         if self.driver_class == self._supported_drivers.remote:
             self._options.set_capability("moz:firefoxOptions", {})
             self._options.enable_downloads = True
+            # There are issues with window size/position when running Firefox
+            # under Wayland, so we use XWayland instead.
+            os.environ["MOZ_ENABLE_WAYLAND"] = "0"
         if self.driver_class == self._supported_drivers.webkitgtk:
             self._options.overlay_scrollbars_enabled = False
 
@@ -301,7 +308,7 @@ def driver(request):
 
     if driver_instance is None:
         driver_instance = selenium_driver.driver
-  
+
     yield driver_instance
 
 

py/test/selenium/webdriver/chrome/chrome_service_tests.py

@@ -17,6 +17,7 @@
 import os
 import subprocess
 import time
+from unittest.mock import patch
 
 import pytest
 
@@ -125,8 +126,6 @@ def test_uses_path_from_env_variable(self, service):
         assert "chromedriver" in service.path
 
     def test_updates_path_after_setting_env_variable(self, service):
-        new_path = "/foo/bar"
-        os.environ["SE_CHROMEDRIVER"] = new_path
         service.executable_path = self.service_path  # Simulating the update
-
-        assert "chromedriver" in service.executable_path
+        with patch.dict("os.environ", {"SE_CHROMEDRIVER": "/foo/bar"}):
+            assert "chromedriver" in service.executable_path

py/test/selenium/webdriver/chrome/proxy_tests.py

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import os
+from unittest.mock import patch
 
 import pytest
 import urllib3
@@ -25,20 +25,15 @@
 
 @pytest.mark.no_driver_after_test
 def test_bad_proxy_doesnt_interfere(clean_driver, clean_service):
-    # these values should be ignored if ignore_local_proxy_environment_variables() is called.
-    os.environ["https_proxy"] = "bad"
-    os.environ["http_proxy"] = "bad"
+    # Proxy environment variables should be ignored if
+    # ignore_local_proxy_environment_variables() is called.
 
     options = webdriver.ChromeOptions()
-
     options.ignore_local_proxy_environment_variables()
-
     chrome_kwargs = {"options": options, "service": clean_service}
-    driver = clean_driver(**chrome_kwargs)
-
+    with patch.dict("os.environ", {"http_proxy": "bad", "https_proxy": "bad"}):
+        driver = clean_driver(**chrome_kwargs)
     assert hasattr(driver, "command_executor")
     assert hasattr(driver.command_executor, "_proxy_url")
     assert isinstance(driver.command_executor._conn, urllib3.PoolManager)
-    os.environ.pop("https_proxy")
-    os.environ.pop("http_proxy")
     driver.quit()

py/test/selenium/webdriver/edge/edge_service_tests.py

@@ -17,6 +17,7 @@
 import os
 import subprocess
 import time
+from unittest.mock import patch
 
 import pytest
 
@@ -125,8 +126,6 @@ def test_uses_path_from_env_variable(self, service):
         assert "msedgedriver" in service.path
 
     def test_updates_path_after_setting_env_variable(self, service):
-        new_path = "/foo/bar"
-        os.environ["SE_EDGEDRIVER"] = new_path
         service.executable_path = self.service_path  # Simulating the update
-
-        assert "msedgedriver" in service.executable_path
+        with patch.dict("os.environ", {"SE_EDGEDRIVER": "/foo/bar"}):
+            assert "msedgedriver" in service.executable_path

py/test/selenium/webdriver/firefox/firefox_service_tests.py

@@ -16,6 +16,7 @@
 # under the License.
 import os
 import subprocess
+from unittest.mock import patch
 
 import pytest
 
@@ -79,8 +80,6 @@ def test_uses_path_from_env_variable(self, service):
         assert "geckodriver" in service.path
 
     def test_updates_path_after_setting_env_variable(self, service):
-        new_path = "/foo/bar"
-        os.environ["SE_GECKODRIVER"] = new_path
         service.executable_path = self.service_path  # Simulating the update
-
-        assert "geckodriver" in service.executable_path
+        with patch.dict("os.environ", {"SE_GECKODRIVER": "/foo/bar"}):
+            assert "geckodriver" in service.executable_path

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

@@ -0,0 +1,62 @@
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import os
+import platform
+from unittest.mock import patch
+
+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(request):  # noqa: F821
+    options = Options()
+    if request.config.getoption("--headless"):
+        options.add_argument("-headless")
+    # 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"}):
+        try:
+            driver = webdriver.Firefox(options=options)
+            size = driver.get_window_size()
+            assert size["height"] > 500
+            assert size["width"] > 500
+        finally:
+            driver.quit()
+
+
+@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")
+# Firefox opens in a small window when running on Linux/Wayland
+def test_firefox_opens_large_when_running_wayland(request):  # noqa: F821
+    options = Options()
+    if request.config.getoption("--headless"):
+        options.add_argument("-headless")
+    try:
+        driver = webdriver.Firefox(options=options)
+        size = driver.get_window_size()
+        assert size["height"] > 500
+        assert size["width"] > 500
+    finally:
+        driver.quit()

py/test/selenium/webdriver/safari/safari_service_tests.py

@@ -16,6 +16,7 @@
 # under the License.
 
 import os
+from unittest.mock import patch
 
 import pytest
 
@@ -41,11 +42,9 @@ def test_uses_path_from_env_variable(self, service):
         assert "safaridriver" in service.path
 
     def test_updates_path_after_setting_env_variable(self, service):
-        new_path = "/foo/bar"
-        os.environ["SE_SAFARIDRIVER"] = new_path
         service.executable_path = self.service_path  # Simulating the update
-
-        assert "safaridriver" in service.executable_path
+        with patch.dict("os.environ", {"SE_SAFARIDRIVER": "/foo/bar"}):
+            assert "safaridriver" in service.executable_path
 
 
 def test_enable_logging():

py/test/unit/selenium/webdriver/remote/remote_connection_tests.py

@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import os
 from unittest.mock import patch
 from urllib import parse
 
@@ -168,18 +167,17 @@ def test_get_proxy_direct_via_client_config():
 
 
 def test_get_proxy_system_matches_no_proxy_via_client_config():
-    os.environ["HTTP_PROXY"] = "http://admin:admin@system_proxy.com:8080"
-    os.environ["NO_PROXY"] = "localhost,127.0.0.1"
-    client_config = ClientConfig(
-        remote_server_addr="http://localhost:4444", proxy=Proxy({"proxyType": ProxyType.SYSTEM})
-    )
-    remote_connection = RemoteConnection(client_config=client_config)
-    conn = remote_connection._get_connection_manager()
-    assert isinstance(conn, urllib3.PoolManager)
-    proxy_url = remote_connection._client_config.get_proxy_url()
-    assert proxy_url is None
-    os.environ.pop("HTTP_PROXY")
-    os.environ.pop("NO_PROXY")
+    with patch.dict(
+        "os.environ", {"HTTP_PROXY": "http://admin:admin@system_proxy.com:8080", "NO_PROXY": "localhost,127.0.0.1"}
+    ):
+        client_config = ClientConfig(
+            remote_server_addr="http://localhost:4444", proxy=Proxy({"proxyType": ProxyType.SYSTEM})
+        )
+        remote_connection = RemoteConnection(client_config=client_config)
+        conn = remote_connection._get_connection_manager()
+        assert isinstance(conn, urllib3.PoolManager)
+        proxy_url = remote_connection._client_config.get_proxy_url()
+        assert proxy_url is None
 
 
 def test_get_proxy_url_none(mock_proxy_settings_missing):

rb/lib/selenium/webdriver/common/print_options.rb

@@ -17,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-
 module Selenium
   module WebDriver
     # Represents options for printing a page.