Skip to content

Commit 07f47d8

Browse files
authored
Merge branch 'trunk' into sm_electron
2 parents b2748ff + ae7c141 commit 07f47d8

File tree

471 files changed

+10607
-8712
lines changed

Some content is hidden

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

471 files changed

+10607
-8712
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ body:
5050
id: selenium-version
5151
attributes:
5252
label: What version of Selenium are you currently using?
53-
description: Important! The latest released version of Selenium is 4.32 and we can't fix old versions.
53+
description: Important! The latest released version of Selenium is 4.33 and we can't fix old versions.
5454
placeholder: e.g., 4.17.0
5555
validations:
5656
required: true

.github/workflows/bazel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
node-version: ${{ inputs.node-version }}
123123
- name: Setup Bazel with caching
124124
if: inputs.caching
125-
uses: bazel-contrib/setup-bazel@0.13.0
125+
uses: bazel-contrib/setup-bazel@0.15.0
126126
with:
127127
bazelisk-cache: true
128128
bazelrc: common --color=yes
@@ -136,7 +136,7 @@ jobs:
136136
repository-cache: true
137137
- name: Setup Bazel without caching
138138
if: inputs.caching == false
139-
uses: bazel-contrib/setup-bazel@0.13.0
139+
uses: bazel-contrib/setup-bazel@0.15.0
140140
with:
141141
bazelrc: common --color=yes
142142
- name: Setup curl for Ubuntu

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: CI - Grid UI
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- 'javascript/grid-ui/**'
7+
push:
8+
branches:
9+
- trunk
10+
paths:
11+
- 'javascript/grid-ui/**'
12+
workflow_dispatch:
13+
workflow_call:
14+
15+
jobs:
16+
grid-ui-tests:
17+
runs-on: ubuntu-latest
18+
name: Grid UI Component Tests
19+
steps:
20+
- name: Checkout source tree
21+
uses: actions/checkout@v4
22+
with:
23+
fetch-depth: 50
24+
25+
- name: Setup Node.js
26+
uses: actions/setup-node@v4
27+
with:
28+
node-version: '18'
29+
cache: 'npm'
30+
cache-dependency-path: 'javascript/grid-ui/package.json'
31+
32+
- name: Install dependencies
33+
working-directory: javascript/grid-ui
34+
run: npm install
35+
36+
- name: Run component tests
37+
working-directory: javascript/grid-ui
38+
run: npm test

.github/workflows/ci-python.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
- name: Install dependencies
2828
run: |
2929
python -m pip install --upgrade pip
30-
pip install tox==4.25.0
31-
- name: Test with tox
30+
pip install tox==4.27.0
31+
- name: Generate docs
3232
run: tox -c py/tox.ini
3333
env:
3434
TOXENV: docs
@@ -47,11 +47,10 @@ jobs:
4747
- name: Install dependencies
4848
run: |
4949
python -m pip install --upgrade pip
50-
pip install tox==4.25.0
51-
- name: Test with tox
50+
pip install tox==4.27.0
51+
- name: Run type checking
5252
run: |
53-
tox -c py/tox.ini -- --cobertura-xml-report ci || true
54-
bash <(curl -s https://codecov.io/bash) -f py/ci/cobertura.xml
53+
tox -c py/tox.ini || true
5554
env:
5655
TOXENV: mypy
5756

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
fetch-depth: 50
2727
- name: Setup Bazel
28-
uses: bazel-contrib/setup-bazel@0.13.0
28+
uses: bazel-contrib/setup-bazel@0.15.0
2929
with:
3030
bazelisk-cache: true
3131
cache-version: 2

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ py/selenium/webdriver/remote/getAttribute.js
7575
py/selenium/webdriver/remote/isDisplayed.js
7676
py/docs/build/
7777
py/docs/source/**/*
78+
!py/docs/source/conf.py
79+
!py/docs/source/*.rst
7880
py/build/
7981
py/LICENSE
8082
py/pytestdebug.log

AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ Ben Congleton <[email protected]>
104104
Ben Kucera <[email protected]>
105105
106106
Ben Sedat <[email protected]>
107+
107108
Benjamin Forehand Jr <[email protected]>
108109
Benoit Pierre <[email protected]>
109110
@@ -221,6 +222,7 @@ David Wang
221222
David Zhu <[email protected]>
222223
Debanjan Choudhury <[email protected]>
223224
225+
DeflateAwning <[email protected]>
224226
Denis Demchenko <[email protected]>
225227
Dennis Oelkers <[email protected]>
226228
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@@ -863,6 +865,7 @@ Tobias Lidskog <[email protected]>
863865
Tobias Smolka <[email protected]>
864866
Toda Hiroshi <[email protected]>
865867
868+
Tom Hughes <[email protected]>
866869
Tom Longhurst <[email protected]>
867870
Tom Trumper <[email protected]>
868871

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: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
module(name = "selenium")
22

33
bazel_dep(name = "apple_rules_lint", version = "0.4.0")
4-
bazel_dep(name = "aspect_rules_lint", version = "1.4.2")
54
bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
65
bazel_dep(name = "aspect_rules_esbuild", version = "0.21.0")
7-
bazel_dep(name = "aspect_rules_js", version = "2.1.3")
8-
bazel_dep(name = "aspect_rules_ts", version = "3.4.0")
6+
bazel_dep(name = "aspect_rules_js", version = "2.3.7")
7+
bazel_dep(name = "aspect_rules_ts", version = "3.6.0")
98
bazel_dep(name = "bazel_features", version = "1.23.0")
109
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1110
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
@@ -21,6 +20,7 @@ bazel_dep(name = "rules_cc", version = "0.1.1", dev_dependency = True)
2120
bazel_dep(name = "rules_dotnet", version = "0.17.5")
2221
bazel_dep(name = "rules_java", version = "8.7.1")
2322
bazel_dep(name = "rules_jvm_external", version = "6.6")
23+
bazel_dep(name = "rules_multitool", version = "1.3.0")
2424
bazel_dep(name = "rules_nodejs", version = "6.3.2")
2525
bazel_dep(name = "rules_oci", version = "1.8.0")
2626
bazel_dep(name = "rules_pkg", version = "1.0.1")
@@ -31,12 +31,16 @@ 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",
3838
)
3939

40+
multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
41+
multitool.hub(lockfile = "//:multitool.lock.json")
42+
use_repo(multitool, "multitool")
43+
4044
linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
4145
linter.configure(
4246
name = "java-spotbugs",
@@ -180,7 +184,7 @@ maven.install(
180184
"com.google.auto:auto-common:1.2.2",
181185
"com.google.auto.service:auto-service:1.1.1",
182186
"com.google.auto.service:auto-service-annotations:1.1.1",
183-
"com.google.googlejavaformat:google-java-format:1.26.0",
187+
"com.google.googlejavaformat:google-java-format:1.27.0",
184188
"com.graphql-java:graphql-java:22.3",
185189
"dev.failsafe:failsafe:3.3.2",
186190
"io.grpc:grpc-context:1.72.0",
@@ -202,8 +206,8 @@ maven.install(
202206
"io.opentelemetry:opentelemetry-sdk-testing",
203207
"io.opentelemetry:opentelemetry-sdk-trace",
204208
"it.ozimov:embedded-redis:0.7.3",
205-
"net.bytebuddy:byte-buddy:1.17.5",
206-
"org.htmlunit:htmlunit-core-js:4.11.0",
209+
"net.bytebuddy:byte-buddy:1.17.6",
210+
"org.htmlunit:htmlunit-core-js:4.12.0",
207211
"org.apache.commons:commons-exec:1.4.0",
208212
"org.apache.logging.log4j:log4j-core:2.24.3",
209213
"org.assertj:assertj-core:3.27.3",
@@ -218,15 +222,15 @@ maven.install(
218222
"org.junit.platform:junit-platform-reporting",
219223
"org.junit.platform:junit-platform-commons",
220224
"org.junit.platform:junit-platform-engine",
221-
"org.mockito:mockito-core:5.17.0",
222-
"org.redisson:redisson:3.46.0",
225+
"org.mockito:mockito-core:5.18.0",
226+
"org.redisson:redisson:3.47.0",
223227
"org.slf4j:slf4j-api:2.0.17",
224228
"org.slf4j:slf4j-jdk14:2.0.17",
225229
"org.tomlj:tomlj:1.1.1",
226230
"org.zeromq:jeromq:0.6.0",
227231
],
228232
boms = [
229-
"io.opentelemetry:opentelemetry-bom:1.49.0",
233+
"io.opentelemetry:opentelemetry-bom:1.50.0",
230234
"io.netty:netty-bom:4.1.121.Final",
231235
"org.junit:junit-bom:5.12.2",
232236
],
@@ -366,13 +370,17 @@ use_repo(
366370
pin_browsers_extension = use_extension("//common:repositories.bzl", "pin_browsers_extension")
367371
use_repo(
368372
pin_browsers_extension,
373+
"linux_beta_chrome",
374+
"linux_beta_chromedriver",
369375
"linux_beta_firefox",
370376
"linux_chrome",
371377
"linux_chromedriver",
372378
"linux_edge",
373379
"linux_edgedriver",
374380
"linux_firefox",
375381
"linux_geckodriver",
382+
"mac_beta_chrome",
383+
"mac_beta_chromedriver",
376384
"mac_beta_firefox",
377385
"mac_chrome",
378386
"mac_chromedriver",

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

0 commit comments

Comments
 (0)