Merge branch 'trunk' into py_bidi_log

Author: Delta456

.github/label-commenter-config.yml

@@ -6,7 +6,7 @@ labels:
         body: |
           @{{ issue.user.login }}, thank you for creating this issue. We will troubleshoot it as soon as we can.
 
-          Selenium Triage Team: remember to follow the [Triage Guide](https://github.com/SeleniumHQ/selenium/blob/trunk/README.md)
+          Selenium Triage Team: remember to follow the [Triage Guide](https://github.com/SeleniumHQ/selenium/wiki/How-to-Triage-Issues)
   - name: G-w3c
     labeled:
       issue:

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")

dotnet/src/webdriver/Firefox/FirefoxOptions.cs

@@ -83,9 +83,9 @@ public FirefoxOptions()
         this.AddKnownCapabilityName(FirefoxOptions.FirefoxLegacyProfileCapability, "Profile property");
         this.AddKnownCapabilityName(FirefoxOptions.FirefoxLegacyBinaryCapability, "BrowserExecutableLocation property");
         this.AddKnownCapabilityName(FirefoxOptions.FirefoxEnableDevToolsProtocolCapability, "EnableDevToolsProtocol property");
-        // Firefox 129 onwards the CDP protocol will not be enabled by default. Setting this preference will enable it.
         // https://fxdx.dev/deprecating-cdp-support-in-firefox-embracing-the-future-with-webdriver-bidi/.
-        this.SetPreference("remote.active-protocols", 3);
+        // Enable BiDi only
+        this.SetPreference("remote.active-protocols", 1);
     }
 
     /// <summary>

java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java

@@ -166,10 +166,13 @@ public WebSocket openSocket(HttpRequest request, WebSocket.Listener listener) {
       throw new ConnectionFailedException("JdkWebSocket initial request execution error", e);
     }
 
+    java.net.http.WebSocket.Builder builder = client.newWebSocketBuilder();
+
+    request.getHeaderNames().forEach(name -> builder.header(name, request.getHeader(name)));
+
     CompletableFuture<Integer> closed = new CompletableFuture<>();
     CompletableFuture<java.net.http.WebSocket> webSocketCompletableFuture =
-        client
-            .newWebSocketBuilder()
+        builder
             .connectTimeout(connectTimeout)
             .buildAsync(
                 uri,

java/test/org/openqa/selenium/bidi/network/AddInterceptParametersTest.java

@@ -18,20 +18,17 @@
 package org.openqa.selenium.bidi.network;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.openqa.selenium.testing.drivers.Browser.EDGE;
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.bidi.module.Network;
 import org.openqa.selenium.testing.JupiterTestBase;
 import org.openqa.selenium.testing.NeedsFreshDriver;
-import org.openqa.selenium.testing.NotYetImplemented;
 
 class AddInterceptParametersTest extends JupiterTestBase {
 
   @Test
   @NeedsFreshDriver
-  @NotYetImplemented(EDGE)
   void canAddInterceptPhase() {
     try (Network network = new Network(driver)) {
       String intercept =
@@ -42,7 +39,6 @@ void canAddInterceptPhase() {
 
   @Test
   @NeedsFreshDriver
-  @NotYetImplemented(EDGE)
   void canAddInterceptPhases() {
     try (Network network = new Network(driver)) {
       String intercept =
@@ -55,7 +51,6 @@ void canAddInterceptPhases() {
 
   @Test
   @NeedsFreshDriver
-  @NotYetImplemented(EDGE)
   void canAddStringUrlPattern() {
     try (Network network = new Network(driver)) {
       String intercept =
@@ -68,7 +63,6 @@ void canAddStringUrlPattern() {
 
   @Test
   @NeedsFreshDriver
-  @NotYetImplemented(EDGE)
   void canAddStringUrlPatterns() {
     try (Network network = new Network(driver)) {
       String intercept =
@@ -84,7 +78,6 @@ void canAddStringUrlPatterns() {
 
   @Test
   @NeedsFreshDriver
-  @NotYetImplemented(EDGE)
   void canAddUrlPattern() {
     try (Network network = new Network(driver)) {
       UrlPattern pattern =
@@ -104,7 +97,6 @@ void canAddUrlPattern() {
 
   @Test
   @NeedsFreshDriver
-  @NotYetImplemented(EDGE)
   void canAddUrlPatterns() {
     try (Network network = new Network(driver)) {
       UrlPattern pattern1 =

java/test/org/openqa/selenium/bidi/network/BUILD.bazel

@@ -8,6 +8,7 @@ java_selenium_test_suite(
     browsers = [
         "firefox",
         "chrome",
+        "edge",
     ],
     tags = [
         "selenium-remote",

java/test/org/openqa/selenium/bidi/network/NetworkCommandsTest.java

@@ -57,7 +57,6 @@ void canAddIntercept() {
 
   @Test
   @NeedsFreshDriver
-  @NotYetImplemented(EDGE)
   void canContinueRequest() throws InterruptedException {
     try (Network network = new Network(driver)) {
       String intercept =

java/test/org/openqa/selenium/bidi/network/NetworkEventsTest.java

@@ -39,7 +39,6 @@ class NetworkEventsTest extends JupiterTestBase {
 
   @Test
   @NeedsFreshDriver
-  @NotYetImplemented(EDGE)
   void canListenToBeforeRequestSentEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (Network network = new Network(driver)) {
@@ -60,7 +59,6 @@ void canListenToBeforeRequestSentEvent()
 
   @Test
   @NeedsFreshDriver
-  @NotYetImplemented(EDGE)
   void canListenToResponseStartedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (Network network = new Network(driver)) {
@@ -83,7 +81,6 @@ void canListenToResponseStartedEvent()
 
   @Test
   @NeedsFreshDriver
-  @NotYetImplemented(EDGE)
   void canListenToResponseCompletedEvent()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (Network network = new Network(driver)) {
@@ -106,7 +103,6 @@ void canListenToResponseCompletedEvent()
 
   @Test
   @NeedsFreshDriver
-  @NotYetImplemented(EDGE)
   void canListenToResponseCompletedEventWithCookie()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (Network network = new Network(driver)) {

javascript/selenium-webdriver/firefox.js

@@ -247,9 +247,9 @@ class Options extends Capabilities {
   constructor(other) {
     super(other)
     this.setBrowserName(Browser.FIREFOX)
-    // Firefox 129 onwards the CDP protocol will not be enabled by default. Setting this preference will enable it.
     // https://fxdx.dev/deprecating-cdp-support-in-firefox-embracing-the-future-with-webdriver-bidi/.
-    this.setPreference('remote.active-protocols', 3)
+    // Enable BiDi only
+    this.setPreference('remote.active-protocols', 1)
   }
 
   /**

javascript/selenium-webdriver/test/firefox/options_test.js

@@ -90,7 +90,7 @@ suite(
             assert.deepStrictEqual(
               {
                 androidPackage: 'org.mozilla.firefox',
-                prefs: { 'remote.active-protocols': 3 },
+                prefs: { 'remote.active-protocols': 1 },
               },
               firefoxOptions,
             )