Merge branch 'trunk' into py-bidi-browsing_context

shbenzer · web-flow · commit f5a9f854c142 · 2025-04-24T14:13:07.000-04:00
diff --git a/common/repositories.bzl b/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")
diff --git a/dotnet/src/webdriver/Firefox/FirefoxOptions.cs b/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>
diff --git a/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java b/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,
diff --git a/javascript/selenium-webdriver/firefox.js b/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)
   }
 
   /**
diff --git a/javascript/selenium-webdriver/test/firefox/options_test.js b/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,
             )
diff --git a/py/selenium/webdriver/firefox/options.py b/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()
 
diff --git a/py/test/selenium/webdriver/marionette/mn_options_tests.py b/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
diff --git a/py/test/unit/selenium/webdriver/firefox/firefox_options_tests.py b/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):
diff --git a/py/test/unit/selenium/webdriver/remote/new_session_tests.py b/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}},
                 },
             ],
         }
diff --git a/rb/lib/selenium/webdriver/firefox/options.rb b/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
 
diff --git a/rb/spec/unit/selenium/webdriver/firefox/driver_spec.rb b/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
diff --git a/rb/spec/unit/selenium/webdriver/firefox/options_spec.rb b/rb/spec/unit/selenium/webdriver/firefox/options_spec.rb
@@ -154,7 +154,7 @@ module Firefox
             options.add_preference('intl.accepted_languages', 'en-US')
 
             prefs    = options.as_json['moz:firefoxOptions']['prefs']
-            expected = {'intl.accepted_languages' => 'en-US', 'remote.active-protocols' => 3}
+            expected = {'intl.accepted_languages' => 'en-US', 'remote.active-protocols' => 1}
             expect(prefs).to eq(expected)
           end
         end
@@ -185,7 +185,7 @@ module Firefox
           it 'returns empty options by default' do
             expect(options.as_json).to eq('browserName' => 'firefox',
                                           'acceptInsecureCerts' => true,
-                                          'moz:firefoxOptions' => {'prefs' => {'remote.active-protocols' => 3}},
+                                          'moz:firefoxOptions' => {'prefs' => {'remote.active-protocols' => 1}},
                                           'moz:debuggerAddress' => true)
           end
 
@@ -195,7 +195,7 @@ module Firefox
                                           'browserName' => 'firefox',
                                           'foo:bar' => {'foo' => 'bar'},
                                           'moz:debuggerAddress' => true,
-                                          'moz:firefoxOptions' => {'prefs' => {'remote.active-protocols' => 3}})
+                                          'moz:firefoxOptions' => {'prefs' => {'remote.active-protocols' => 1}})
           end
 
           it 'converts to a json hash' do
@@ -240,7 +240,7 @@ module Firefox
                                        'moz:debuggerAddress' => true,
                                        key => {'args' => %w[foo bar],
                                                'binary' => '/foo/bar',
-                                               'prefs' => {'foo' => 'bar', 'remote.active-protocols' => 3},
+                                               'prefs' => {'foo' => 'bar', 'remote.active-protocols' => 1},
                                                'env' => {'FOO' => 'bar'},
                                                'profile' => 'encoded_profile',
                                                'log' => {'level' => 'debug'},

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ suite(`
`90`	`90`	`assert.deepStrictEqual(`
`91`	`91`	`{`
`92`	`92`	`androidPackage: 'org.mozilla.firefox',`
`93`		`- prefs: { 'remote.active-protocols': 3 },`
	`93`	`+ prefs: { 'remote.active-protocols': 1 },`
`94`	`94`	`},`
`95`	`95`	`firefoxOptions,`
`96`	`96`	`)`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ def test_first_match_when_2_different_option_types():`
`103`	`103`	`"browserName": "firefox",`
`104`	`104`	`"acceptInsecureCerts": True,`
`105`	`105`	`"moz:debuggerAddress": True,`
`106`		`- "moz:firefoxOptions": {"args": ["foo"], "prefs": {"remote.active-protocols": 3}},`
	`106`	`+ "moz:firefoxOptions": {"args": ["foo"], "prefs": {"remote.active-protocols": 1}},`
`107`	`107`	`},`
`108`	`108`	`],`
`109`	`109`	`}`