Skip to content

Commit 9348d6c

Browse files
authored
Merge branch 'trunk' into py-browsing-context_events
2 parents 2dd2b74 + 02cfe2d commit 9348d6c

File tree

62 files changed

+2091
-567
lines changed

Some content is hidden

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

62 files changed

+2091
-567
lines changed

.github/workflows/ci-grid-ui.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Node.js
2626
uses: actions/setup-node@v4
2727
with:
28-
node-version: '18'
28+
node-version: '20'
2929
cache: 'npm'
3030
cache-dependency-path: 'javascript/grid-ui/package.json'
3131

.github/workflows/pre-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
- name: Update browser versions
9494
run: ./go update_browsers ${{ github.event.inputs.chrome_channel }}
9595
- name: Commit browser updates
96-
run: git commit -m "update pinned browser versions"
96+
run: git commit -m "update pinned browser versions" || true
9797
- name: Update devtools versions
9898
run: ./go all:update_cdp ${{ github.event.inputs.chrome_channel }}
9999
- name: Commit DevTools updates

.skipped-tests

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
-//java/test/org/openqa/selenium/edge:EdgeDriverFunctionalTest
66
-//java/test/org/openqa/selenium/edge:EdgeDriverFunctionalTest-edge
77
-//java/test/org/openqa/selenium/edge:EdgeDriverFunctionalTest-remote
8+
-//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest
89
-//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest
910
-//java/test/org/openqa/selenium/grid/gridui:OverallGridTest
1011
-//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ on Github.
6262

6363
This document will guide you through the contribution process.
6464

65-
### Step 1: Fork
65+
### Step 1: Fork & Clone
6666

6767
Fork the project [on Github](https://github.com/seleniumhq/selenium)
68-
and check out your copy locally. Use `--depth 1` for a quick check out.
69-
The repository is ~2GB and checking the whole history takes a while.
68+
and clone the repository locally. Use `--depth 1` for a quick clone.
69+
The repository is over 2GB and cloning the whole history takes a while.
7070

7171
```shell
7272
% git clone [email protected]:username/selenium.git --depth 1
@@ -76,7 +76,7 @@ The repository is ~2GB and checking the whole history takes a while.
7676

7777
#### Dependencies
7878

79-
We bundle dependencies in the _third-party/_ directory that is not
79+
We bundle dependencies in the _third-party/_ directory that are not
8080
part of the proper project. Any changes to files in this directory or
8181
its subdirectories should be sent upstream to the respective projects.
8282
Please don't send your patch to us as we cannot accept it.

MODULE.bazel

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ bazel_dep(name = "rules_ruby", version = "0.19.0")
3131
# Until `rules_jvm_external` 6.8 ships
3232
git_override(
3333
module_name = "rules_jvm_external",
34-
commit = "d8af22108bd8b353a226140570008231f2921931",
34+
commit = "29c451d2a62aa2451f5810c005ecac925b4772b6",
3535
patch_strip = 1,
3636
patches = ["//java:rules_jvm_external_javadoc.patch"],
3737
remote = "https://github.com/bazel-contrib/rules_jvm_external.git",
@@ -206,7 +206,7 @@ maven.install(
206206
"io.opentelemetry:opentelemetry-sdk-testing",
207207
"io.opentelemetry:opentelemetry-sdk-trace",
208208
"it.ozimov:embedded-redis:0.7.3",
209-
"net.bytebuddy:byte-buddy:1.17.5",
209+
"net.bytebuddy:byte-buddy:1.17.6",
210210
"org.htmlunit:htmlunit-core-js:4.12.0",
211211
"org.apache.commons:commons-exec:1.4.0",
212212
"org.apache.logging.log4j:log4j-core:2.24.3",
@@ -228,6 +228,8 @@ maven.install(
228228
"org.slf4j:slf4j-jdk14:2.0.17",
229229
"org.tomlj:tomlj:1.1.1",
230230
"org.zeromq:jeromq:0.6.0",
231+
"uk.org.webcompere:system-stubs-jupiter:2.1.8",
232+
"uk.org.webcompere:system-stubs-core:2.1.8",
231233
],
232234
boms = [
233235
"io.opentelemetry:opentelemetry-bom:1.50.0",

README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
<a href="#developing">Developing</a> •
1616
<a href="#testing">Testing</a> •
1717
<a href="#documenting">Documenting</a> •
18-
<a href="#releasing">Releasing</a> •
19-
<a href="#license">License</a>
18+
<a href="#releasing">Releasing</a>
2019
</p>
2120

2221
<br>
@@ -555,7 +554,3 @@ If you have access to the Selenium EngFlow repository, you can have the assets b
555554
```shell
556555
./go all:release['--config', 'release']
557556
```
558-
559-
## License
560-
561-
Selenium's source code is made available under the [Apache 2.0 license](https://github.com/SeleniumHQ/selenium/blob/trunk/LICENSE).

common/repositories.bzl

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ def pin_browsers():
1111

1212
http_archive(
1313
name = "linux_firefox",
14-
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/en-US/firefox-139.0.4.tar.xz",
15-
sha256 = "fe22686f09a0c46390fea430b26cccc323d92af26869699f394f25b5e71527a3",
14+
url = "https://ftp.mozilla.org/pub/firefox/releases/140.0.1/linux-x86_64/en-US/firefox-140.0.1.tar.xz",
15+
sha256 = "81596b5061753e1524a3aa41512aee667ec34eac24abd52cd919c759a90a2a60",
1616
build_file_content = """
1717
load("@aspect_rules_js//js:defs.bzl", "js_library")
1818
package(default_visibility = ["//visibility:public"])
@@ -33,8 +33,8 @@ js_library(
3333

3434
dmg_archive(
3535
name = "mac_firefox",
36-
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0.4/mac/en-US/Firefox%20139.0.4.dmg",
37-
sha256 = "fc058bf34094828c0919ad81672d697cf01dfa291ba9b11e0b1c119588878405",
36+
url = "https://ftp.mozilla.org/pub/firefox/releases/140.0.1/mac/en-US/Firefox%20140.0.1.dmg",
37+
sha256 = "1049b957e497df1a9ab5fdfad971b02f00f3573029a23cbb930bc4fa60d2c7b4",
3838
build_file_content = """
3939
load("@aspect_rules_js//js:defs.bzl", "js_library")
4040
package(default_visibility = ["//visibility:public"])
@@ -50,8 +50,8 @@ js_library(
5050

5151
http_archive(
5252
name = "linux_beta_firefox",
53-
url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b9/linux-x86_64/en-US/firefox-140.0b9.tar.xz",
54-
sha256 = "812450fa61d36d44944fc9691a628b5c87d18268e68a15d9e54ac82ba4adfba5",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/141.0b2/linux-x86_64/en-US/firefox-141.0b2.tar.xz",
54+
sha256 = "0d60ea31ec38fed508fbfc6105af7cc86f564a8e21f464fd91e8bcc44c48e040",
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/140.0b9/mac/en-US/Firefox%20140.0b9.dmg",
76-
sha256 = "7c764a8210fe44797ba49982bede4d32235b33c7c996f4caffd15e5a06cf62a1",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/141.0b2/mac/en-US/Firefox%20141.0b2.dmg",
76+
sha256 = "16ee4e04eae3db7e7f08fc8953b06f0cc4b55899da739608d9da4cd4750b1da6",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
package(default_visibility = ["//visibility:public"])
@@ -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/8146afbf-4969-4acb-baa7-a1b8a83745e5/MicrosoftEdge-137.0.3296.93.pkg",
127-
sha256 = "e098a79ceb0a843ff0d9331c86b27a49a6b26ba798f28d59a342ce8c2534f54b",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/3c804dbf-368d-489d-8836-9756b2d4b017/MicrosoftEdge-138.0.3351.55.pkg",
127+
sha256 = "1ff1aecb62fe10151a4ebfd05b9834a4d94955d7f58ba434b2576468381c0f9b",
128128
move = {
129-
"MicrosoftEdge-137.0.3296.93.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-138.0.3351.55.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_137.0.3296.93-1_amd64.deb",
147-
sha256 = "482f21e9443f79ee5995058066c982d42a392b2e24697ba8329bd566d4c83074",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_138.0.3351.55-1_amd64.deb",
147+
sha256 = "4990ad02387363c06ac0cf48312db4f35456c514fee20420ae3bdeedabccec1a",
148148
build_file_content = """
149149
load("@aspect_rules_js//js:defs.bzl", "js_library")
150150
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/137.0.7151.119/linux64/chrome-linux64.zip",
203-
sha256 = "680a672ed0cc7b8fae6ee5b21691a55273228b05e1f3f80580606c4db203994a",
202+
url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.49/linux64/chrome-linux64.zip",
203+
sha256 = "8751e9a4a0ca7c8127acb06c4fe0c438d091c0fb1c3712dcd4ea277773177304",
204204
build_file_content = """
205205
load("@aspect_rules_js//js:defs.bzl", "js_library")
206206
package(default_visibility = ["//visibility:public"])
@@ -220,8 +220,8 @@ js_library(
220220
)
221221
http_archive(
222222
name = "mac_chrome",
223-
url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.119/mac-x64/chrome-mac-x64.zip",
224-
sha256 = "86d2e1cb317e78c4f5aefc70cf00e4fdaf9dcc80cf4ca3634abccf6d8781181e",
223+
url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.49/mac-x64/chrome-mac-x64.zip",
224+
sha256 = "98e4f2e97a31ca7104f72ca1fbe506b0070dd181f0bccc1b4af90ff950ceaa57",
225225
strip_prefix = "chrome-mac-x64",
226226
patch_cmds = [
227227
"mv 'Google Chrome for Testing.app' Chrome.app",
@@ -241,8 +241,8 @@ js_library(
241241
)
242242
http_archive(
243243
name = "linux_chromedriver",
244-
url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.119/linux64/chromedriver-linux64.zip",
245-
sha256 = "f4138b39e4fbe948e887ed5c1e0286c539fa81657cd5f2d8d51c1f68921a8880",
244+
url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.49/linux64/chromedriver-linux64.zip",
245+
sha256 = "0ef562acf7a87733a77cf51f52e3841cf7fb63c17d618b6ccb45a9a53ca89017",
246246
strip_prefix = "chromedriver-linux64",
247247
build_file_content = """
248248
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -259,8 +259,8 @@ js_library(
259259

260260
http_archive(
261261
name = "mac_chromedriver",
262-
url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.119/mac-x64/chromedriver-mac-x64.zip",
263-
sha256 = "3502bec185bbb2732f21648d02ed3ac3c478ddfa35f3deddc9cc1433335309b7",
262+
url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.49/mac-x64/chromedriver-mac-x64.zip",
263+
sha256 = "bff1fc6075912698a1699a8d0979da3fdc576775a3fe78e6ae68338459c8882f",
264264
strip_prefix = "chromedriver-mac-x64",
265265
build_file_content = """
266266
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -277,8 +277,8 @@ js_library(
277277

278278
http_archive(
279279
name = "linux_beta_chrome",
280-
url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.35/linux64/chrome-linux64.zip",
281-
sha256 = "4fd1afa4d0bb059114c1f244c09722d03aad151681adb40e09235ad9592d6e49",
280+
url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.6/linux64/chrome-linux64.zip",
281+
sha256 = "9e13f092899dacaaf24a9f75ef9152ca32eccc0a3e92c442b655ef1df49166db",
282282
build_file_content = """
283283
load("@aspect_rules_js//js:defs.bzl", "js_library")
284284
package(default_visibility = ["//visibility:public"])
@@ -298,8 +298,8 @@ js_library(
298298
)
299299
http_archive(
300300
name = "mac_beta_chrome",
301-
url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.35/mac-x64/chrome-mac-x64.zip",
302-
sha256 = "e312cd055c263120b75e6387a294458d340e57da332efca89f7afdc4541458b9",
301+
url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.6/mac-x64/chrome-mac-x64.zip",
302+
sha256 = "feae578043bfe8625304f7ff84776038ee7e02c11c7502a67f0f1b89503d31ee",
303303
strip_prefix = "chrome-mac-x64",
304304
patch_cmds = [
305305
"mv 'Google Chrome for Testing.app' Chrome.app",
@@ -319,8 +319,8 @@ js_library(
319319
)
320320
http_archive(
321321
name = "linux_beta_chromedriver",
322-
url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.35/linux64/chromedriver-linux64.zip",
323-
sha256 = "eb423d4d1928fe03ad2414316c103607bf4624029f8fc115c54bcc4b1f613f0d",
322+
url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.6/linux64/chromedriver-linux64.zip",
323+
sha256 = "05acfaa7e695b62e9b605646fc499bf1ab0abb11d410e250e06305a93eb69496",
324324
strip_prefix = "chromedriver-linux64",
325325
build_file_content = """
326326
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -337,8 +337,8 @@ js_library(
337337

338338
http_archive(
339339
name = "mac_beta_chromedriver",
340-
url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.35/mac-x64/chromedriver-mac-x64.zip",
341-
sha256 = "b9863dc8e00469b5eb74be7472653694c9fd6943e3e47ec9e1b00c93c9fb68a6",
340+
url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.6/mac-x64/chromedriver-mac-x64.zip",
341+
sha256 = "8f6c3b5af19b9e37582f82159a43f0b2cfe6eaa91102ea5a712b047ab63b9008",
342342
strip_prefix = "chromedriver-mac-x64",
343343
build_file_content = """
344344
load("@aspect_rules_js//js:defs.bzl", "js_library")

java/maven_install.json

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": -590372100,
4-
"__RESOLVED_ARTIFACTS_HASH": -1597870205,
3+
"__INPUT_ARTIFACTS_HASH": -1882913193,
4+
"__RESOLVED_ARTIFACTS_HASH": -76667375,
55
"artifacts": {
66
"com.beust:jcommander": {
77
"shasums": {
@@ -438,10 +438,10 @@
438438
},
439439
"net.bytebuddy:byte-buddy": {
440440
"shasums": {
441-
"jar": "71568c9f8396677219f650268fbf6493ded484edcdbdf2dae6129ca5be81e8db",
442-
"sources": "722eaa17b935a25e994f625b32ec166c53d23770d0659c615e62a0b26ce71615"
441+
"jar": "d26382a839cb26d5c62a0b0f04715bcef55a531f96ac6ce40de452a1c0539e70",
442+
"sources": "bed458b6ee0df083eb4e1bd2dd171f7d8abe30993b510a9a241ba7bff3653e27"
443443
},
444-
"version": "1.17.5"
444+
"version": "1.17.6"
445445
},
446446
"net.bytebuddy:byte-buddy-agent": {
447447
"shasums": {
@@ -793,11 +793,26 @@
793793
"sources": "f04df788868c471833d4aff0c9fdced4042069efe392c768f4373c04b559f5e3"
794794
},
795795
"version": "0.1.1-beta2"
796+
},
797+
"uk.org.webcompere:system-stubs-core": {
798+
"shasums": {
799+
"jar": "9c27322cfc7043c75384ad444007b0880ca18fe7231d69bfa69616bc773cafe1",
800+
"sources": "6e6c4adf9094e0200400a5d9f8086c8a1c4a0940919fe0b30d30543b483d5687"
801+
},
802+
"version": "2.1.8"
803+
},
804+
"uk.org.webcompere:system-stubs-jupiter": {
805+
"shasums": {
806+
"jar": "9a24867a51f5d22db67d9052a06bc5dd2e9a3e273bc2ee9814620f2d9f25d0a8",
807+
"sources": "208bfe2907ab022fe206402f2ef6b1ea445f8240f072a14a49e338c1448fb2b6"
808+
},
809+
"version": "2.1.8"
796810
}
797811
},
798812
"conflict_resolution": {
799813
"com.google.errorprone:error_prone_annotations:2.36.0": "com.google.errorprone:error_prone_annotations:2.38.0",
800814
"io.projectreactor:reactor-core:3.6.2": "io.projectreactor:reactor-core:3.6.6",
815+
"net.bytebuddy:byte-buddy-agent:1.17.4": "net.bytebuddy:byte-buddy-agent:1.17.5",
801816
"org.apache.commons:commons-lang3:3.14.0": "org.apache.commons:commons-lang3:3.17.0",
802817
"org.objenesis:objenesis:3.4": "org.objenesis:objenesis:3.3",
803818
"org.reactivestreams:reactive-streams:1.0.4": "org.reactivestreams:reactive-streams:1.0.3"
@@ -1133,6 +1148,13 @@
11331148
],
11341149
"redis.clients.authentication:redis-authx-core": [
11351150
"org.slf4j:slf4j-api"
1151+
],
1152+
"uk.org.webcompere:system-stubs-core": [
1153+
"net.bytebuddy:byte-buddy",
1154+
"net.bytebuddy:byte-buddy-agent"
1155+
],
1156+
"uk.org.webcompere:system-stubs-jupiter": [
1157+
"uk.org.webcompere:system-stubs-core"
11361158
]
11371159
},
11381160
"packages": {
@@ -2901,6 +2923,20 @@
29012923
],
29022924
"redis.clients.authentication:redis-authx-core": [
29032925
"redis.clients.authentication.core"
2926+
],
2927+
"uk.org.webcompere:system-stubs-core": [
2928+
"uk.org.webcompere.systemstubs",
2929+
"uk.org.webcompere.systemstubs.environment",
2930+
"uk.org.webcompere.systemstubs.exception",
2931+
"uk.org.webcompere.systemstubs.properties",
2932+
"uk.org.webcompere.systemstubs.resource",
2933+
"uk.org.webcompere.systemstubs.security",
2934+
"uk.org.webcompere.systemstubs.stream",
2935+
"uk.org.webcompere.systemstubs.stream.input",
2936+
"uk.org.webcompere.systemstubs.stream.output"
2937+
],
2938+
"uk.org.webcompere:system-stubs-jupiter": [
2939+
"uk.org.webcompere.systemstubs.jupiter"
29042940
]
29052941
},
29062942
"repositories": {
@@ -3130,7 +3166,11 @@
31303166
"org.zeromq:jeromq",
31313167
"org.zeromq:jeromq:jar:sources",
31323168
"redis.clients.authentication:redis-authx-core",
3133-
"redis.clients.authentication:redis-authx-core:jar:sources"
3169+
"redis.clients.authentication:redis-authx-core:jar:sources",
3170+
"uk.org.webcompere:system-stubs-core",
3171+
"uk.org.webcompere:system-stubs-core:jar:sources",
3172+
"uk.org.webcompere:system-stubs-jupiter",
3173+
"uk.org.webcompere:system-stubs-jupiter:jar:sources"
31343174
]
31353175
},
31363176
"services": {

0 commit comments

Comments
 (0)