Skip to content

Commit 3a5fee6

Browse files
aguspeaguspe
authored
Merge branch 'trunk' into rb_add_support_for_chrome_beta
2 parents 07618eb + 479d197 commit 3a5fee6

File tree

42 files changed

+1682
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1682
-299
lines changed

‎.github/label-commenter-config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ labels:
66
body: |
77
@{{ issue.user.login }}, thank you for creating this issue. We will troubleshoot it as soon as we can.
88
9-
Selenium Triage Team: remember to follow the [Triage Guide](https://github.com/SeleniumHQ/selenium/blob/trunk/README.md)
9+
Selenium Triage Team: remember to follow the [Triage Guide](https://github.com/SeleniumHQ/selenium/wiki/How-to-Triage-Issues)
1010
- name: G-w3c
1111
labeled:
1212
issue:

‎common/repositories.bzl‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ js_library(
123123

124124
pkg_archive(
125125
name = "mac_edge",
126-
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/b405fb02-0c71-4762-be7f-08a88b17c176/MicrosoftEdge-135.0.3179.85.pkg",
127-
sha256 = "292b4794bc9452908d67971e04f5184c167316b2e0fcead3f5739c3738a358b6",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/784d0da7-3b50-4888-8a30-159d8af03e55/MicrosoftEdge-135.0.3179.98.pkg",
127+
sha256 = "fda91427e9172b704228f01a35f9a426479e9f5f592f6ff2de85e75ade0b25c8",
128128
move = {
129-
"MicrosoftEdge-135.0.3179.85.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-135.0.3179.98.pkg/Payload/Microsoft Edge.app": "Edge.app",
130130
},
131131
build_file_content = """
132132
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
143143

144144
deb_archive(
145145
name = "linux_edge",
146-
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_135.0.3179.85-1_amd64.deb",
147-
sha256 = "c756292acbe3d89c75fd5135dde13f68292ff9beeb18e428e3171162ed864060",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_135.0.3179.98-1_amd64.deb",
147+
sha256 = "0291339ce51e66b2987f6e5fc76c310b9a5c54c0d05c3f70b3cdda2743f6774e",
148148
build_file_content = """
149149
load("@aspect_rules_js//js:defs.bzl", "js_library")
150150
package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
165165

166166
http_archive(
167167
name = "linux_edgedriver",
168-
url = "https://msedgedriver.azureedge.net/135.0.3179.85/edgedriver_linux64.zip",
169-
sha256 = "d05ef36fc3c6fdc4bc0b0c96a9fffc0ce0afd2289f08dfe2cd141d41e8dea195",
168+
url = "https://msedgedriver.azureedge.net/135.0.3179.98/edgedriver_linux64.zip",
169+
sha256 = "ea89d43034f86c70f37b9f580cd7bc5f18cb9537697af55e113b94c9dc766336",
170170
build_file_content = """
171171
load("@aspect_rules_js//js:defs.bzl", "js_library")
172172
package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
182182

183183
http_archive(
184184
name = "mac_edgedriver",
185-
url = "https://msedgedriver.azureedge.net/135.0.3179.85/edgedriver_mac64.zip",
186-
sha256 = "9f9c59099b664c9c4a8f59d501e9fcf0dec3e4bfd860635669730a6e59d55ca9",
185+
url = "https://msedgedriver.azureedge.net/135.0.3179.98/edgedriver_mac64.zip",
186+
sha256 = "5b8b5e019e432b86e49a4e1d8f3a312373a0c7ad88b84ae2419419d100f99fdb",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])
@@ -199,8 +199,8 @@ js_library(
199199

200200
http_archive(
201201
name = "linux_chrome",
202-
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.95/linux64/chrome-linux64.zip",
203-
sha256 = "bf406b6de491825f7db9d4b635b9ba56a8e8b6e60fac130382f561bb62f12d7e",
202+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.114/linux64/chrome-linux64.zip",
203+
sha256 = "dd86dbac5d1a362bf9d46818e21e4afe2e8b1b419e0810573d298842eef88b82",
204204
build_file_content = """
205205
load("@aspect_rules_js//js:defs.bzl", "js_library")
206206
package(default_visibility = ["//visibility:public"])
@@ -221,8 +221,8 @@ js_library(
221221

222222
http_archive(
223223
name = "mac_chrome",
224-
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.95/mac-x64/chrome-mac-x64.zip",
225-
sha256 = "949f46e9fd58b96a3c5fc436dde9b4aa04e683258a83867d6f0ec8abb58537ec",
224+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.114/mac-x64/chrome-mac-x64.zip",
225+
sha256 = "e7deb29034368567bab7f5b24a7c09d329ef2023f61e6ed349b714abb80292c2",
226226
strip_prefix = "chrome-mac-x64",
227227
patch_cmds = [
228228
"mv 'Google Chrome for Testing.app' Chrome.app",
@@ -243,8 +243,8 @@ js_library(
243243

244244
http_archive(
245245
name = "linux_chromedriver",
246-
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.95/linux64/chromedriver-linux64.zip",
247-
sha256 = "64e1f8bf5bbb94983dff82874b79f45039e5463323e8912d38b83a1277f9e272",
246+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.114/linux64/chromedriver-linux64.zip",
247+
sha256 = "28ef94323503f927f8fca4650d5acf6325e69829720900cc696c3d8179ce855c",
248248
strip_prefix = "chromedriver-linux64",
249249
build_file_content = """
250250
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -261,8 +261,8 @@ js_library(
261261

262262
http_archive(
263263
name = "mac_chromedriver",
264-
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.95/mac-x64/chromedriver-mac-x64.zip",
265-
sha256 = "9bf330af1a080d6bbda6dc80cf064de371941e65b826cfc5a589628d1c78aef9",
264+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.114/mac-x64/chromedriver-mac-x64.zip",
265+
sha256 = "a1da3421971762c4d6f258fb8e49dfd3aa855387f0b82d0333a59e972feb21d9",
266266
strip_prefix = "chromedriver-mac-x64",
267267
build_file_content = """
268268
load("@aspect_rules_js//js:defs.bzl", "js_library")

‎dotnet/src/webdriver/Firefox/FirefoxOptions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ public FirefoxOptions()
8383
this.AddKnownCapabilityName(FirefoxOptions.FirefoxLegacyProfileCapability, "Profile property");
8484
this.AddKnownCapabilityName(FirefoxOptions.FirefoxLegacyBinaryCapability, "BrowserExecutableLocation property");
8585
this.AddKnownCapabilityName(FirefoxOptions.FirefoxEnableDevToolsProtocolCapability, "EnableDevToolsProtocol property");
86-
// Firefox 129 onwards the CDP protocol will not be enabled by default. Setting this preference will enable it.
8786
// https://fxdx.dev/deprecating-cdp-support-in-firefox-embracing-the-future-with-webdriver-bidi/.
88-
this.SetPreference("remote.active-protocols", 3);
87+
// Enable BiDi only
88+
this.SetPreference("remote.active-protocols", 1);
8989
}
9090

9191
/// <summary>

‎java/src/org/openqa/selenium/firefox/FirefoxOptions.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ public class FirefoxOptions extends AbstractDriverOptions<FirefoxOptions> {
6262
public FirefoxOptions() {
6363
setCapability(CapabilityType.BROWSER_NAME, FIREFOX.browserName());
6464
setAcceptInsecureCerts(true);
65-
// Firefox 129 onwards the CDP protocol will not be enabled by default. Setting this preference
66-
// will enable it.
6765
// https://fxdx.dev/deprecating-cdp-support-in-firefox-embracing-the-future-with-webdriver-bidi/.
68-
addPreference("remote.active-protocols", 3);
66+
// Enable BiDi only
67+
addPreference("remote.active-protocols", 1);
6968
}
7069

7170
public FirefoxOptions(Capabilities source) {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,13 @@ public WebSocket openSocket(HttpRequest request, WebSocket.Listener listener) {
166166
throw new ConnectionFailedException("JdkWebSocket initial request execution error", e);
167167
}
168168

169+
java.net.http.WebSocket.Builder builder = client.newWebSocketBuilder();
170+
171+
request.getHeaderNames().forEach(name -> builder.header(name, request.getHeader(name)));
172+
169173
CompletableFuture<Integer> closed = new CompletableFuture<>();
170174
CompletableFuture<java.net.http.WebSocket> webSocketCompletableFuture =
171-
client
172-
.newWebSocketBuilder()
175+
builder
173176
.connectTimeout(connectTimeout)
174177
.buildAsync(
175178
uri,

‎java/test/org/openqa/selenium/bidi/input/DefaultWheelTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ void shouldScrollFromViewportByGivenAmount() {
146146
.pause(3000)
147147
.getSequences());
148148

149+
wait.until(driver -> driver.findElement(By.name("nested_scrolling_frame")).isDisplayed());
150+
149151
assertTrue(inViewport(footer));
150152
}
151153

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,17 @@
1818
package org.openqa.selenium.bidi.network;
1919

2020
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
21-
import static org.openqa.selenium.testing.drivers.Browser.EDGE;
2221

2322
import java.util.List;
2423
import org.junit.jupiter.api.Test;
2524
import org.openqa.selenium.bidi.module.Network;
2625
import org.openqa.selenium.testing.JupiterTestBase;
2726
import org.openqa.selenium.testing.NeedsFreshDriver;
28-
import org.openqa.selenium.testing.NotYetImplemented;
2927

3028
class AddInterceptParametersTest extends JupiterTestBase {
3129

3230
@Test
3331
@NeedsFreshDriver
34-
@NotYetImplemented(EDGE)
3532
void canAddInterceptPhase() {
3633
try (Network network = new Network(driver)) {
3734
String intercept =
@@ -42,7 +39,6 @@ void canAddInterceptPhase() {
4239

4340
@Test
4441
@NeedsFreshDriver
45-
@NotYetImplemented(EDGE)
4642
void canAddInterceptPhases() {
4743
try (Network network = new Network(driver)) {
4844
String intercept =
@@ -55,7 +51,6 @@ void canAddInterceptPhases() {
5551

5652
@Test
5753
@NeedsFreshDriver
58-
@NotYetImplemented(EDGE)
5954
void canAddStringUrlPattern() {
6055
try (Network network = new Network(driver)) {
6156
String intercept =
@@ -68,7 +63,6 @@ void canAddStringUrlPattern() {
6863

6964
@Test
7065
@NeedsFreshDriver
71-
@NotYetImplemented(EDGE)
7266
void canAddStringUrlPatterns() {
7367
try (Network network = new Network(driver)) {
7468
String intercept =
@@ -84,7 +78,6 @@ void canAddStringUrlPatterns() {
8478

8579
@Test
8680
@NeedsFreshDriver
87-
@NotYetImplemented(EDGE)
8881
void canAddUrlPattern() {
8982
try (Network network = new Network(driver)) {
9083
UrlPattern pattern =
@@ -104,7 +97,6 @@ void canAddUrlPattern() {
10497

10598
@Test
10699
@NeedsFreshDriver
107-
@NotYetImplemented(EDGE)
108100
void canAddUrlPatterns() {
109101
try (Network network = new Network(driver)) {
110102
UrlPattern pattern1 =

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ java_selenium_test_suite(
88
browsers = [
99
"firefox",
1010
"chrome",
11+
"edge",
1112
],
1213
tags = [
1314
"selenium-remote",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ void canAddIntercept() {
5757

5858
@Test
5959
@NeedsFreshDriver
60-
@NotYetImplemented(EDGE)
6160
void canContinueRequest() throws InterruptedException {
6261
try (Network network = new Network(driver)) {
6362
String intercept =

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class NetworkEventsTest extends JupiterTestBase {
3939

4040
@Test
4141
@NeedsFreshDriver
42-
@NotYetImplemented(EDGE)
4342
void canListenToBeforeRequestSentEvent()
4443
throws ExecutionException, InterruptedException, TimeoutException {
4544
try (Network network = new Network(driver)) {
@@ -60,7 +59,6 @@ void canListenToBeforeRequestSentEvent()
6059

6160
@Test
6261
@NeedsFreshDriver
63-
@NotYetImplemented(EDGE)
6462
void canListenToResponseStartedEvent()
6563
throws ExecutionException, InterruptedException, TimeoutException {
6664
try (Network network = new Network(driver)) {
@@ -83,7 +81,6 @@ void canListenToResponseStartedEvent()
8381

8482
@Test
8583
@NeedsFreshDriver
86-
@NotYetImplemented(EDGE)
8784
void canListenToResponseCompletedEvent()
8885
throws ExecutionException, InterruptedException, TimeoutException {
8986
try (Network network = new Network(driver)) {
@@ -106,7 +103,6 @@ void canListenToResponseCompletedEvent()
106103

107104
@Test
108105
@NeedsFreshDriver
109-
@NotYetImplemented(EDGE)
110106
void canListenToResponseCompletedEventWithCookie()
111107
throws ExecutionException, InterruptedException, TimeoutException {
112108
try (Network network = new Network(driver)) {

0 commit comments

Comments
 (0)