Merge branch 'trunk' into edge_network_bidi_tests

Author: Delta456

common/repositories.bzl

@@ -199,8 +199,8 @@ js_library(
 
     http_archive(
         name = "linux_chrome",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.95/linux64/chrome-linux64.zip",
-        sha256 = "bf406b6de491825f7db9d4b635b9ba56a8e8b6e60fac130382f561bb62f12d7e",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.97/linux64/chrome-linux64.zip",
+        sha256 = "dca0a86931162c85fbd054cc037519fcf855dca912c7fd2dc2e2e48fb7d59961",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -221,8 +221,8 @@ js_library(
 
     http_archive(
         name = "mac_chrome",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.95/mac-x64/chrome-mac-x64.zip",
-        sha256 = "949f46e9fd58b96a3c5fc436dde9b4aa04e683258a83867d6f0ec8abb58537ec",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.97/mac-x64/chrome-mac-x64.zip",
+        sha256 = "53880ac98a04490c647d1a5649eb0ebd8001741bb17501df34908e8826fe516f",
         strip_prefix = "chrome-mac-x64",
         patch_cmds = [
             "mv 'Google Chrome for Testing.app' Chrome.app",
@@ -243,8 +243,8 @@ js_library(
 
     http_archive(
         name = "linux_chromedriver",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.95/linux64/chromedriver-linux64.zip",
-        sha256 = "64e1f8bf5bbb94983dff82874b79f45039e5463323e8912d38b83a1277f9e272",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.97/linux64/chromedriver-linux64.zip",
+        sha256 = "12a0e6e8035b3671a7a884e33949f1f5154d2d2ca68593715851f6f3a5e836ec",
         strip_prefix = "chromedriver-linux64",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -261,8 +261,8 @@ js_library(
 
     http_archive(
         name = "mac_chromedriver",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.95/mac-x64/chromedriver-mac-x64.zip",
-        sha256 = "9bf330af1a080d6bbda6dc80cf064de371941e65b826cfc5a589628d1c78aef9",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.97/mac-x64/chromedriver-mac-x64.zip",
+        sha256 = "2eedf6406ca4e9f11a4c196ce56e8d25c15dc68bd8ea07c7da8423d2327e9aa1",
         strip_prefix = "chromedriver-mac-x64",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")

py/selenium/webdriver/common/bidi/script.py

@@ -18,8 +18,7 @@
 from dataclasses import dataclass
 from typing import List
 
-from .session import session_subscribe
-from .session import session_unsubscribe
+from .session import Session
 
 
 class Script:
@@ -43,12 +42,14 @@ def remove_console_message_handler(self, id):
 
     def _subscribe_to_log_entries(self):
         if not self.log_entry_subscribed:
-            self.conn.execute(session_subscribe(LogEntryAdded.event_class))
+            session = Session(self.conn)
+            self.conn.execute(session.subscribe(LogEntryAdded.event_class))
             self.log_entry_subscribed = True
 
     def _unsubscribe_from_log_entries(self):
         if self.log_entry_subscribed and LogEntryAdded.event_class not in self.conn.callbacks:
-            self.conn.execute(session_unsubscribe(LogEntryAdded.event_class))
+            session = Session(self.conn)
+            self.conn.execute(session.unsubscribe(LogEntryAdded.event_class))
             self.log_entry_subscribed = False
 
     def _handle_log_entry(self, type, handler):

py/selenium/webdriver/common/bidi/session.py

@@ -15,32 +15,43 @@
 # specific language governing permissions and limitations
 # under the License.
 
+from selenium.webdriver.common.bidi.common import command_builder
 
-def session_subscribe(*events, browsing_contexts=None):
-    cmd_dict = {
-        "method": "session.subscribe",
-        "params": {
+
+class Session:
+
+    def __init__(self, conn):
+        self.conn = conn
+
+    def subscribe(self, *events, browsing_contexts=None):
+        params = {
             "events": events,
-        },
-    }
-    if browsing_contexts is None:
-        browsing_contexts = []
-    if browsing_contexts:
-        cmd_dict["params"]["browsingContexts"] = browsing_contexts
-    _ = yield cmd_dict
-    return None
-
-
-def session_unsubscribe(*events, browsing_contexts=None):
-    cmd_dict = {
-        "method": "session.unsubscribe",
-        "params": {
+        }
+        if browsing_contexts is None:
+            browsing_contexts = []
+        if browsing_contexts:
+            params["browsingContexts"] = browsing_contexts
+        return command_builder("session.subscribe", params)
+
+    def unsubscribe(self, *events, browsing_contexts=None):
+        params = {
             "events": events,
-        },
-    }
-    if browsing_contexts is None:
-        browsing_contexts = []
-    if browsing_contexts:
-        cmd_dict["params"]["browsingContexts"] = browsing_contexts
-    _ = yield cmd_dict
-    return None
+        }
+        if browsing_contexts is None:
+            browsing_contexts = []
+        if browsing_contexts:
+            params["browsingContexts"] = browsing_contexts
+        return command_builder("session.unsubscribe", params)
+
+    def status(self):
+        """
+        The session.status command returns information about the remote end's readiness
+        to create new sessions and may include implementation-specific metadata.
+
+        Returns
+        -------
+        dict
+            Dictionary containing the ready state (bool), message (str) and metadata
+        """
+        cmd = command_builder("session.status", {})
+        return self.conn.execute(cmd)

py/selenium/webdriver/remote/webdriver.py

@@ -46,6 +46,7 @@
 from selenium.webdriver.common.bidi.browser import Browser
 from selenium.webdriver.common.bidi.network import Network
 from selenium.webdriver.common.bidi.script import Script
+from selenium.webdriver.common.bidi.session import Session
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.options import ArgOptions
 from selenium.webdriver.common.options import BaseOptions
@@ -262,6 +263,7 @@ def __init__(
         self._script = None
         self._network = None
         self._browser = None
+        self._bidi_session = None
 
     def __repr__(self):
         return f'<{type(self).__module__}.{type(self).__name__} (session="{self.session_id}")>'
@@ -1277,6 +1279,19 @@ def browser(self):
 
         return self._browser
 
+    @property
+    def _session(self):
+        """
+        Returns the BiDi session object for the current WebDriver session.
+        """
+        if not self._websocket_connection:
+            self._start_bidi()
+
+        if self._bidi_session is None:
+            self._bidi_session = Session(self._websocket_connection)
+
+        return self._bidi_session
+
     def _get_cdp_details(self):
         import json
 

py/test/selenium/webdriver/common/bidi_session_tests.py

@@ -0,0 +1,50 @@
+# 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 pytest
+
+from selenium.webdriver.common.window import WindowTypes
+
+
+@pytest.mark.xfail_safari
+def test_session_status(driver):
+    result = driver._session.status()
+    assert result is not None
+    assert "ready" in result
+    assert "message" in result
+    assert isinstance(result["ready"], bool)
+    assert isinstance(result["message"], str)
+
+
+@pytest.mark.xfail_safari
+def test_session_status_not_closed_with_one_window(driver):
+    # initial session status
+    initial_status = driver._session.status()
+    assert initial_status is not None
+
+    # Open new window and tab
+    driver.switch_to.new_window(WindowTypes.WINDOW)
+    driver.switch_to.new_window(WindowTypes.TAB)
+
+    # Close one window
+    driver.close()
+
+    # Session should still be active
+    status_after_closing = driver._session.status()
+    assert status_after_closing is not None
+    assert "ready" in status_after_closing
+    assert "message" in status_after_closing