Merge branch 'trunk' into selenium_manager

Author: Delta456

py/test/selenium/webdriver/common/api_example_tests.py

@@ -243,19 +243,21 @@ def test_is_element_displayed(driver, pages):
 @pytest.mark.xfail_safari
 def test_move_window_position(driver, pages):
     pages.load("blank.html")
-    loc = driver.get_window_position()
+    original = driver.get_window_position()
     # note can't test 0,0 since some OS's dont allow that location
     # because of system toolbars
     new_x = 50
     new_y = 50
-    if loc["x"] == new_x:
+    if original["x"] == new_x:
         new_x += 10
-    if loc["y"] == new_y:
+    if original["y"] == new_y:
         new_y += 10
     driver.set_window_position(new_x, new_y)
     loc = driver.get_window_position()
-    assert loc["x"] == new_x
-    assert loc["y"] == new_y
+    # The window manager may clamp the requested position to the usable area of
+    # the current display (e.g. below the menu bar / toolbar), so assert the
+    # window moved rather than that it landed at an exact coordinate.
+    assert loc["x"] != original["x"] or loc["y"] != original["y"]
 
 
 @pytest.mark.xfail_edge(reason="Window sometimes does not resize")

py/test/selenium/webdriver/common/bidi_network_tests.py

@@ -98,11 +98,11 @@ def callback(request: Request):
 # origin, suppressing authRequired challenges in later tests — restart the
 # driver afterwards so challenge-dependent tests start clean.
 @pytest.mark.needs_fresh_driver
-def test_continue_with_auth(driver):
+def test_continue_with_auth(driver, pages):
     callback_id = driver.network.add_auth_handler("postman", "password")
     assert callback_id is not None, "Request handler not added"
     driver.browsing_context.navigate(
-        context=driver.current_window_handle, url="https://postman-echo.com/basic-auth", wait=ReadinessState.COMPLETE
+        context=driver.current_window_handle, url=pages.url("basic-auth"), wait=ReadinessState.COMPLETE
     )
     assert "authenticated" in driver.page_source, "Authorization failed"
 
@@ -410,32 +410,32 @@ def test_request_and_response_handlers_compose(driver, pages):
 # needs_fresh_driver: successful authentication warms the browser's HTTP auth
 # cache for the origin, which would suppress the challenge in later tests.
 @pytest.mark.needs_fresh_driver
-def test_provide_credentials_for_matching_url(driver):
+def test_provide_credentials_for_matching_url(driver, pages):
     def handle_authentication(auth):
         auth.provide_credentials("postman", "password")
 
-    handler_id = driver.network.add_authentication_handler(["https://postman-echo.com/**"], handle_authentication)
+    handler_id = driver.network.add_authentication_handler(["**/basic-auth"], handle_authentication)
     try:
-        _navigate(driver, "https://postman-echo.com/basic-auth")
+        _navigate(driver, pages.url("basic-auth"))
         assert "authenticated" in driver.page_source, "Authorization failed"
     finally:
         driver.network.remove_authentication_handler(handler_id)
 
 
-def test_cancel_authentication_challenge(driver):
+def test_cancel_authentication_challenge(driver, pages):
     def handle_authentication(auth):
         auth.cancel()
 
     handler_id = driver.network.add_authentication_handler(handle_authentication)
     try:
-        _navigate(driver, "https://postman-echo.com/basic-auth")
+        _navigate(driver, pages.url("basic-auth"))
         assert "authenticated" not in driver.page_source, "Cancelled challenge still authenticated"
     finally:
         driver.network.remove_authentication_handler(handler_id)
 
 
 @pytest.mark.needs_fresh_driver
-def test_authentication_handler_observes_challenge_details(driver):
+def test_authentication_handler_observes_challenge_details(driver, pages):
     challenges = []
 
     def handle_authentication(auth):
@@ -444,9 +444,9 @@ def handle_authentication(auth):
 
     handler_id = driver.network.add_authentication_handler(handle_authentication)
     try:
-        _navigate(driver, "https://postman-echo.com/basic-auth")
+        _navigate(driver, pages.url("basic-auth"))
         assert challenges, "Authentication handler did not run"
-        assert challenges[0][0].startswith("https://postman-echo.com/basic-auth")
+        assert challenges[0][0].endswith("/basic-auth")
     finally:
         driver.network.remove_authentication_handler(handler_id)
 
@@ -472,21 +472,21 @@ def test_clear_authentication_handlers_removes_all_intercepts(driver):
 # ---------------------------------------------------------------------------
 
 
-def test_extra_header_is_sent_with_requests(driver):
+def test_extra_header_is_sent_with_requests(driver, pages):
     driver.network.add_extra_header("x-selenium-extra", "extra-header-value")
     try:
-        _navigate(driver, "https://postman-echo.com/headers")
+        _navigate(driver, pages.url("echo_headers"))
         assert "x-selenium-extra" in driver.page_source, "Extra header not sent"
         assert "extra-header-value" in driver.page_source, "Extra header value not sent"
     finally:
         driver.network.clear_extra_headers()
 
 
-def test_removed_extra_header_is_not_sent(driver):
+def test_removed_extra_header_is_not_sent(driver, pages):
     driver.network.add_extra_header("x-selenium-extra", "extra-header-value")
     driver.network.remove_extra_header("x-selenium-extra")
 
-    _navigate(driver, "https://postman-echo.com/headers")
+    _navigate(driver, pages.url("echo_headers"))
     assert "x-selenium-extra" not in driver.page_source, "Removed extra header still sent"
     assert driver.network.intercepts == [], "Intercept not removed"
 

py/test/selenium/webdriver/common/webserver.py

@@ -20,6 +20,7 @@
 It serves the testing html pages that are needed by the webdriver unit tests.
 """
 
+import base64
 import contextlib
 import logging
 import os
@@ -45,6 +46,11 @@ def updir():
 DEFAULT_PORT = 8000
 HTML_ROOT = os.path.join(WEBDRIVER, "../../../../common/src/web")
 
+# Credentials accepted by the /basic-auth endpoint. Tests that exercise
+# authentication handlers must provide these to be considered authenticated.
+AUTH_USERNAME = "postman"
+AUTH_PASSWORD = "password"
+
 if not os.path.isdir(HTML_ROOT):
     raise Exception(
         "Can't find 'common_web' directory, try setting WEBDRIVER environment variable.\n"
@@ -80,6 +86,18 @@ def _serve_file(self, file_path):
         else:
             return content, "text/html"
 
+    def _is_authenticated(self):
+        """Return True when the request carries the expected Basic credentials."""
+        auth_header = self.headers.get("Authorization", "")
+        if not auth_header.startswith("Basic "):
+            return False
+        try:
+            decoded = base64.b64decode(auth_header.removeprefix("Basic ")).decode("utf-8")
+        except (ValueError, UnicodeDecodeError):
+            return False
+        username, _, password = decoded.partition(":")
+        return username == AUTH_USERNAME and password == AUTH_PASSWORD
+
     def _send_response(self, content_type="text/html"):
         """Send a response."""
         self.send_response(200)
@@ -116,6 +134,20 @@ def do_GET(self):
                 self.wfile.write(b"cookie set")
                 return
 
+            if path == "basic-auth":
+                if self._is_authenticated():
+                    self._send_response("application/json")
+                    self.wfile.write(b'{"authenticated": true}')
+                else:
+                    self.send_response(401)
+                    self.send_header("WWW-Authenticate", 'Basic realm="Fake Realm"')
+                    self.send_header("Content-type", "text/plain")
+                    self.end_headers()
+                    # Body must not contain the substring "authenticated" — tests
+                    # assert its absence when an auth challenge is cancelled.
+                    self.wfile.write(b"Access denied")
+                return
+
             file_path = os.path.join(HTML_ROOT, path)
             if path.startswith("page/"):
                 html = self._serve_page(path[5:])

py/test/selenium/webdriver/common/window_tests.py

@@ -58,8 +58,10 @@ def test_should_set_the_size_of_the_current_window(driver):
 
 def test_should_get_the_position_of_the_current_window(driver):
     position = driver.get_window_position()
-    assert position.get("x") >= 0
-    assert position.get("y") >= 0
+    # x/y may be negative on multi-monitor layouts (e.g. a display left of the
+    # primary); the WebDriver spec places no lower bound on window coordinates.
+    assert isinstance(position.get("x"), int)
+    assert isinstance(position.get("y"), int)
 
 
 @pytest.mark.xfail_chrome
@@ -85,8 +87,10 @@ def test_should_set_the_position_of_the_current_window(driver):
 @pytest.mark.xfail_safari(raises=WebDriverException, reason="Get Window Rect command not implemented")
 def test_should_get_the_rect_of_the_current_window(driver):
     rect = driver.get_window_rect()
-    assert rect.get("x") >= 0
-    assert rect.get("y") >= 0
+    # x/y may be negative on multi-monitor layouts; only width/height have a
+    # genuine non-negative lower bound.
+    assert isinstance(rect.get("x"), int)
+    assert isinstance(rect.get("y"), int)
     assert rect.get("width") >= 0
     assert rect.get("height") >= 0