Merge branch 'SeleniumHQ:trunk' into py-fix-remote-tests

Author: cgoldberg

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,

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

py/selenium/webdriver/firefox/options.py

@@ -44,9 +44,9 @@ def __init__(self) -> None:
         super().__init__()
         self._binary_location = ""
         self._preferences: dict = {}
-        # 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/.
-        self._preferences["remote.active-protocols"] = 3
+        # Enable BiDi only
+        self._preferences["remote.active-protocols"] = 1
         self._profile: Optional[FirefoxProfile] = None
         self.log = Log()
 

py/test/selenium/webdriver/marionette/mn_options_tests.py

@@ -42,7 +42,7 @@ class TestUnit:
     def test_ctor(self):
         opts = Options()
         assert opts.binary_location == ""
-        assert opts._preferences == {"remote.active-protocols": 3}
+        assert opts._preferences == {"remote.active-protocols": 1}
         assert opts._profile is None
         assert not opts._arguments
         assert isinstance(opts.log, Log)
@@ -72,7 +72,7 @@ def test_prefs(self):
         assert len(opts.preferences) == 3
         opts.set_preference("spam", "spam")
         assert len(opts.preferences) == 3
-        assert opts.preferences == {"eggs": True, "remote.active-protocols": 3, "spam": "spam"}
+        assert opts.preferences == {"eggs": True, "remote.active-protocols": 1, "spam": "spam"}
 
     def test_profile(self, tmpdir_factory):
         opts = Options()
@@ -102,7 +102,7 @@ def test_to_capabilities(self):
         firefox_caps.update(
             {
                 "pageLoadStrategy": PageLoadStrategy.normal,
-                "moz:firefoxOptions": {"prefs": {"remote.active-protocols": 3}},
+                "moz:firefoxOptions": {"prefs": {"remote.active-protocols": 1}},
             }
         )
         assert opts.to_capabilities() == firefox_caps

py/test/unit/selenium/webdriver/firefox/firefox_options_tests.py

@@ -79,7 +79,7 @@ def test_set_proxy_isnt_in_moz_prefix(options):
 
     caps = options.to_capabilities()
     assert caps["proxy"]["proxyType"] == "manual"
-    assert caps.get("moz:firefoxOptions") == {"prefs": {"remote.active-protocols": 3}}
+    assert caps.get("moz:firefoxOptions") == {"prefs": {"remote.active-protocols": 1}}
 
 
 def test_raises_exception_if_proxy_is_not_proxy_object(options):

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

@@ -103,7 +103,7 @@ def test_first_match_when_2_different_option_types():
                     "browserName": "firefox",
                     "acceptInsecureCerts": True,
                     "moz:debuggerAddress": True,
-                    "moz:firefoxOptions": {"args": ["foo"], "prefs": {"remote.active-protocols": 3}},
+                    "moz:firefoxOptions": {"args": ["foo"], "prefs": {"remote.active-protocols": 1}},
                 },
             ],
         }

rb/lib/selenium/webdriver/firefox/options.rb

@@ -64,9 +64,9 @@ def initialize(log_level: nil, **opts)
 
           @options[:args] ||= []
           @options[:prefs] ||= {}
-          # 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/.
-          @options[:prefs]['remote.active-protocols'] = 3
+          # Enable BiDi only
+          @options[:prefs]['remote.active-protocols'] = 1
           @options[:env] ||= {}
           @options[:log] ||= {level: log_level} if log_level
 

rb/spec/unit/selenium/webdriver/firefox/driver_spec.rb

@@ -38,7 +38,7 @@ module Firefox
         def expect_request(body: nil, endpoint: nil)
           body = (body || {capabilities: {alwaysMatch: {acceptInsecureCerts: true,
                                                         browserName: 'firefox',
-                                                        'moz:firefoxOptions': {prefs: {'remote.active-protocols' => 3}},
+                                                        'moz:firefoxOptions': {prefs: {'remote.active-protocols' => 1}},
                                                         'moz:debuggerAddress': true}}}).to_json
           endpoint ||= "#{service_manager.uri}/session"
           stub_request(:post, endpoint).with(body: body).to_return(valid_response)
@@ -81,7 +81,7 @@ def expect_request(body: nil, endpoint: nil)
                                                              browserName: 'firefox',
                                                              'moz:firefoxOptions': {
                                                                args: ['-f'],
-                                                               prefs: {'remote.active-protocols' => 3}
+                                                               prefs: {'remote.active-protocols' => 1}
                                                              },
                                                              'moz:debuggerAddress': true}}})
           expect { described_class.new(options: Options.new(**opts)) }.not_to raise_exception