Skip to content

Commit bbb9d0b

Browse files
titusfortnertitusfortner
authored
Merge branch 'trunk' into heap
2 parents da19c94 + 27017a8 commit bbb9d0b

File tree

34 files changed

+938
-230
lines changed

34 files changed

+938
-230
lines changed

‎.skipped-tests‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,9 @@
1919
-//javascript/atoms:test-edge
2020
-//javascript/atoms:test-firefox-beta
2121
-//javascript/chrome-driver/...
22-
-//javascript/selenium-webdriver:test-bidi-network-test.js-chrome
2322
-//javascript/selenium-webdriver:test-builder-test.js-chrome
24-
-//javascript/selenium-webdriver:test-builder-test.js-firefox
2523
-//javascript/selenium-webdriver:test-chrome-devtools-test.js-chrome
26-
-//javascript/selenium-webdriver:test-chrome-options-test.js-chrome
27-
-//javascript/selenium-webdriver:test-chrome-service-test.js-chrome
2824
-//javascript/selenium-webdriver:test-firefox-options-test.js-firefox
29-
-//javascript/selenium-webdriver:test-lib-capabilities-test.js-chrome
30-
-//py:test-chrome-test/selenium/webdriver/chrome/chrome_launcher_tests.py
31-
-//py:test-chrome-test/selenium/webdriver/chrome/chrome_service_tests.py
32-
-//py:test-chrome-test/selenium/webdriver/chrome/proxy_tests.py
33-
-//py:test-edge-test/selenium/webdriver/edge/edge_launcher_tests.py
34-
-//py:test-edge-test/selenium/webdriver/edge/edge_service_tests.py
3525
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome
3626
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-bidi
3727
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-remote

‎common/mirror/selenium‎

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,33 @@
33
"tag_name": "nightly",
44
"assets": [
55
{
6-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.32.0-SNAPSHOT.zip"
6+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.33.0-SNAPSHOT.zip"
77
},
88
{
9-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.32.0-SNAPSHOT.jar"
9+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.33.0-SNAPSHOT.jar"
1010
},
1111
{
12-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.32.0-SNAPSHOT.zip"
12+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.33.0-SNAPSHOT.zip"
13+
}
14+
]
15+
},
16+
{
17+
"tag_name": "selenium-4.32.0",
18+
"assets": [
19+
{
20+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.32.0/selenium-dotnet-4.32.0.zip"
21+
},
22+
{
23+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.32.0/selenium-dotnet-strongnamed-4.32.0.zip"
24+
},
25+
{
26+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.32.0/selenium-java-4.32.0.zip"
27+
},
28+
{
29+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.32.0/selenium-server-4.32.0.jar"
30+
},
31+
{
32+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.32.0/selenium-server-4.32.0.zip"
1333
}
1434
]
1535
},
@@ -836,31 +856,5 @@
836856
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.4.0/selenium-server-4.4.0.zip"
837857
}
838858
]
839-
},
840-
{
841-
"tag_name": "selenium-4.3.0",
842-
"assets": [
843-
{
844-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.3.0/IEDriverServer_Win32_4.3.0.zip"
845-
},
846-
{
847-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.3.0/IEDriverServer_x64_4.3.0.zip"
848-
},
849-
{
850-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.3.0/selenium-dotnet-4.3.0.zip"
851-
},
852-
{
853-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.3.0/selenium-dotnet-strongnamed-4.3.0.zip"
854-
},
855-
{
856-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.3.0/selenium-java-4.3.0.zip"
857-
},
858-
{
859-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.3.0/selenium-server-4.3.0.jar"
860-
},
861-
{
862-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.3.0/selenium-server-4.3.0.zip"
863-
}
864-
]
865859
}
866860
]

‎common/repositories.bzl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ js_library(
5050

5151
http_archive(
5252
name = "linux_beta_firefox",
53-
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b2/linux-x86_64/en-US/firefox-139.0b2.tar.xz",
54-
sha256 = "c53561c12640003b6c1d3c2112e73227451f8e0a956b65be46cd1ca783e6efe1",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b3/linux-x86_64/en-US/firefox-139.0b3.tar.xz",
54+
sha256 = "8db541819ed4c06678e1678715c0d3f2cc43fba21c593dfc6a5f10c7674e98af",
5555
build_file_content = """
5656
load("@aspect_rules_js//js:defs.bzl", "js_library")
5757
package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
7272

7373
dmg_archive(
7474
name = "mac_beta_firefox",
75-
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b2/mac/en-US/Firefox%20139.0b2.dmg",
76-
sha256 = "8a30f4098db4d7053c923344b00fdfea6f7854ed9d819afd33161a7af48c7e32",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b3/mac/en-US/Firefox%20139.0b3.dmg",
76+
sha256 = "a7433bb645cbef9dd123afe8856060dbf6afaa1bab06d14298ebbc7d35968984",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
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.98/edgedriver_linux64.zip",
169-
sha256 = "ea89d43034f86c70f37b9f580cd7bc5f18cb9537697af55e113b94c9dc766336",
168+
url = "https://msedgedriver.azureedge.net/136.0.3240.50/edgedriver_linux64.zip",
169+
sha256 = "c987f3334ab00366d3afea79bddb510367a3b81ead88ff808980d3ed6b86e4aa",
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.98/edgedriver_mac64.zip",
186-
sha256 = "5b8b5e019e432b86e49a4e1d8f3a312373a0c7ad88b84ae2419419d100f99fdb",
185+
url = "https://msedgedriver.azureedge.net/136.0.3240.50/edgedriver_mac64.zip",
186+
sha256 = "9c592695119986af76bd0182bc355716e29844dd97052f77865f55fffbf6db3d",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])

‎dotnet/selenium-dotnet-version.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BUILD FILE SYNTAX: STARLARK
22

3-
SE_VERSION = "4.32.0"
3+
SE_VERSION = "4.33.0-nightly202505022255"
44
ASSEMBLY_VERSION = "4.0.0.0"
55
SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0"]
66

‎java/test/org/openqa/selenium/bidi/storage/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
"chrome",
1010
"firefox",
11+
"edge",
1112
],
1213
tags = [
1314
"selenium-remote",

‎java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public void setUp() {
6363
}
6464

6565
@Test
66-
@NotYetImplemented(EDGE)
6766
public void canGetCookieByName() {
6867
String key = generateUniqueKey();
6968
String value = "set";
@@ -124,7 +123,6 @@ public void canGetCookieInDefaultUserContext() {
124123
}
125124

126125
@Test
127-
@NotYetImplemented(EDGE)
128126
public void canGetCookieInAUserContext() {
129127
Browser browser = new Browser(driver);
130128
String userContext = browser.createUserContext();
@@ -177,7 +175,6 @@ key, new BytesValue(BytesValue.Type.STRING, value), appServer.getHostName()),
177175
}
178176

179177
@Test
180-
@NotYetImplemented(EDGE)
181178
public void canAddCookie() {
182179
String key = generateUniqueKey();
183180
String value = "foo";
@@ -289,7 +286,6 @@ public void canGetAllCookies() {
289286
}
290287

291288
@Test
292-
@NotYetImplemented(EDGE)
293289
public void canDeleteAllCookies() {
294290
addCookieOnServerSide(new Cookie("foo", "set"));
295291
assertSomeCookiesArePresent();
@@ -303,7 +299,6 @@ public void canDeleteAllCookies() {
303299
}
304300

305301
@Test
306-
@NotYetImplemented(EDGE)
307302
public void canDeleteCookieWithName() {
308303
String key1 = generateUniqueKey();
309304
String key2 = generateUniqueKey();
@@ -325,7 +320,6 @@ public void canDeleteCookieWithName() {
325320
}
326321

327322
@Test
328-
@NotYetImplemented(EDGE)
329323
public void testAddCookiesWithDifferentPathsThatAreRelatedToOurs() {
330324
driver.get(appServer.whereIs("/common/animals"));
331325

‎java/version.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
SE_VERSION = "4.32.0"
1+
SE_VERSION = "4.33.0-SNAPSHOT"
22
TOOLS_JAVA_VERSION = "17"

‎javascript/selenium-webdriver/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ load("//javascript/private:browsers.bzl", "BROWSERS")
1111

1212
npm_link_all_packages(name = "node_modules")
1313

14-
VERSION = "4.32.0"
14+
VERSION = "4.33.0-nightly202505022255"
1515

1616
BROWSER_VERSIONS = [
1717
"v134",

‎javascript/selenium-webdriver/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "selenium-webdriver",
3-
"version": "4.32.0",
3+
"version": "4.33.0-nightly202505022255",
44
"description": "The official WebDriver JavaScript bindings from the Selenium project",
55
"license": "Apache-2.0",
66
"keywords": [

‎javascript/selenium-webdriver/test/chrome/devtools_test.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ test.suite(
3434
let driver
3535

3636
beforeEach(async function () {
37-
driver = await env.builder().setChromeOptions(new chrome.Options().addArguments('-headless')).build()
37+
let options = env.builder().getChromeOptions() || new chrome.Options()
38+
options.addArguments('--headless')
39+
driver = await env.builder().setChromeOptions(options).build()
3840
})
3941
afterEach(async () => await driver.quit())
4042

@@ -125,6 +127,7 @@ test.suite(
125127
await driver.register('random', 'random', pageCdpConnection)
126128
await driver.get(fileServer.Pages.basicAuth)
127129
let source = await driver.getPageSource()
130+
console.log(source)
128131
assert.strictEqual(source.includes('Access granted!'), false, source)
129132
})
130133
})

0 commit comments

Comments
 (0)