Skip to content

Commit c0c470b

Browse files
authored
Merge branch 'trunk' into feat-14045/nodejs-env-var-driver-location
2 parents de65192 + 3b61afe commit c0c470b

File tree

449 files changed

+20116
-12720
lines changed

Some content is hidden

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

449 files changed

+20116
-12720
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.34 and we can't fix old versions.
53+
description: Important! The latest released version of Selenium is 4.36 and we can't fix old versions.
5454
placeholder: e.g., 4.17.0
5555
validations:
5656
required: true

.github/label-commenter-config.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ labels:
117117
This is related to code in the Support packages. The support packages contain example code that
118118
many users find helpful, but they do not necessarily represent the best practices for using Selenium,
119119
and the Selenium team is not prioritizing work on them right now.
120-
This doesn't mean that we won't ever work on them, but it is not on our roadmap as we push to release Selenium 5.
120+
This doesn't mean that we won't ever work on them, but it is not on our long term roadmap.
121121
122122
We actively encourage people to create their own wrapper and helper code that makes sense for them.
123123
If you have any questions, please [contact us](https://www.selenium.dev/support)
@@ -127,10 +127,12 @@ labels:
127127
128128
The support packages contain example code that many users find helpful, but they do not necessarily represent
129129
the best practices for using Selenium, and the Selenium team is not currently merging changes to them.
130+
131+
After reviewing the change, unless it is a critical fix or a feature that is needed for Selenium
132+
to work, we will likely close the PR.
130133
131134
We actively encourage people to add the wrapper and helper code that makes sense for them to their own frameworks.
132135
If you have any questions, please [contact us](https://www.selenium.dev/support)
133-
action: close
134136
135137
136138

.github/renovate.json

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
11
{
2-
"labels": ["B-dependencies"]
2+
"labels": [
3+
"B-dependencies"
4+
],
5+
"docker": {
6+
"enabled": false
7+
},
8+
"packageRules": [
9+
{
10+
"matchDatasources": [
11+
"docker"
12+
],
13+
"enabled": false
14+
},
15+
{
16+
"matchPackagePatterns": [
17+
"^docker:",
18+
"^gcr.io/",
19+
"^registry.k8s.io/",
20+
"^quay.io/",
21+
"^ghcr.io/"
22+
],
23+
"enabled": false
24+
}
25+
]
326
}

.github/workflows/ci-java.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828
//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest `
2929
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest `
3030
//java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest `
31-
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
31+
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest `
32+
//java/test/org/openqa/selenium/devtools:NetworkInterceptorRestTest
3233
3334
browser-tests-macos:
3435
name: Browser Tests

.github/workflows/ci-python.yml

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
- name: Checkout source tree
2222
uses: actions/checkout@v4
2323
- name: Set up Python 3.9
24-
uses: actions/setup-python@v4
24+
uses: actions/setup-python@v6
2525
with:
2626
python-version: 3.9
2727
- name: Install dependencies
2828
run: |
2929
python -m pip install --upgrade pip
30-
pip install tox==4.27.0
30+
pip install tox==4.30.2
3131
- name: Generate docs
3232
run: tox -c py/tox.ini
3333
env:
@@ -41,19 +41,35 @@ jobs:
4141
- name: Checkout source tree
4242
uses: actions/checkout@v4
4343
- name: Set up Python 3.9
44-
uses: actions/setup-python@v4
44+
uses: actions/setup-python@v6
4545
with:
4646
python-version: 3.9
4747
- name: Install dependencies
4848
run: |
4949
python -m pip install --upgrade pip
50-
pip install tox==4.27.0
50+
pip install tox==4.30.2
5151
- name: Run type checking
5252
run: |
5353
tox -c py/tox.ini || true
5454
env:
5555
TOXENV: mypy
5656

57+
unit-tests:
58+
name: Unit Tests
59+
needs: build
60+
uses: ./.github/workflows/bazel.yml
61+
strategy:
62+
fail-fast: false
63+
matrix:
64+
include:
65+
- os: ubuntu
66+
- os: macos
67+
with:
68+
name: Unit Tests (${{ matrix.os }})
69+
os: ${{ matrix.os }}
70+
cache-key: python-unit-test-${{ matrix.os }}
71+
run: bazel test //py:unit
72+
5773
remote-tests:
5874
name: Remote Tests
5975
needs: build
@@ -83,6 +99,10 @@ jobs:
8399
os: ubuntu
84100
- browser: firefox
85101
os: ubuntu
102+
- browser: chrome
103+
os: windows
104+
- browser: edge
105+
os: windows
86106
with:
87107
name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
88108
browser: ${{ matrix.browser }}
@@ -108,4 +128,5 @@ jobs:
108128
os: ${{ matrix.os }}
109129
cache-key: py-browser-${{ matrix.browser }}
110130
run: |
131+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}
111132
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}

.github/workflows/ci-ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
matrix:
9797
include:
9898
- browser: edge
99-
os: windows
99+
os: macos
100100
with:
101101
name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
102102
browser: ${{ matrix.browser }}

.github/workflows/stage-release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,5 @@ jobs:
8181
with:
8282
version: ${{ needs.github-release.outputs.version }}
8383
sha: ${{ github.sha }}
84+
secrets:
85+
SELENIUM_CI_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}

.github/workflows/update-documentation.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ on:
1919
- dotnet
2020
- node
2121
- all
22+
force:
23+
description: Force generation even if version is nightly, type "force" to enable
24+
required: false
25+
type: string
26+
default: ""
2227

2328
workflow_call:
2429
inputs:
@@ -32,6 +37,9 @@ on:
3237
required: false
3338
type: string
3439
default: "all"
40+
secrets:
41+
SELENIUM_CI_TOKEN:
42+
required: true
3543

3644
env:
3745
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -60,7 +68,7 @@ jobs:
6068
distribution: 'temurin'
6169
- name: Set up Python 3.9
6270
if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
63-
uses: actions/setup-python@v5
71+
uses: actions/setup-python@v6
6472
with:
6573
python-version: 3.9
6674
- name: Install dependencies
@@ -74,7 +82,7 @@ jobs:
7482
npm install
7583
npm install --prefix javascript/selenium-webdriver
7684
- name: Generate Documentation for selected langauges
77-
run: ./go ${{ inputs.language }}:docs
85+
run: ./go ${{ inputs.language }}:docs ${{ inputs.force }}
7886
- name: Documentation Pull Request
7987
id: cpr
8088
uses: peter-evans/create-pull-request@v6

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ py/docs/source/**/*
7878
!py/docs/source/conf.py
7979
!py/docs/source/*.rst
8080
py/build/
81-
py/LICENSE
8281
py/pytestdebug.log
8382
py/python.iml
8483
selenium.egg-info/

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)