Skip to content

Commit 9b7e7b3

Browse files
authored
Merge branch 'trunk' into trunk-zipperer
2 parents f81d619 + 664555a commit 9b7e7b3

File tree

154 files changed

+4424
-2227
lines changed

Some content is hidden

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

154 files changed

+4424
-2227
lines changed

Diff for: .github/workflows/dotnet-examples.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ jobs:
6161
if: matrix.release == 'nightly' && matrix.os != 'windows'
6262
run:
6363
|
64-
latest_nightly=$(./scripts/latest-nightly-version.sh nuget Selenium.WebDriver)
64+
pip install -r ./scripts/requirements.txt
65+
latest_nightly=$(python ./scripts/latest-nightly-version.py nuget Selenium.WebDriver)
66+
echo $latest_nightly
6567
dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.WebDriver --version $latest_nightly
6668
dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.Support --version $latest_nightly
6769
env:
@@ -71,7 +73,8 @@ jobs:
7173
shell: pwsh
7274
run:
7375
|
74-
$latest_nightly = ./scripts/latest-nightly-version.ps1 nuget Selenium.WebDriver
76+
pip install -r ./scripts/requirements.txt
77+
$latest_nightly = python ./scripts/latest-nightly-version.py nuget Selenium.WebDriver
7578
dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.WebDriver --version $latest_nightly
7679
dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.Support --version $latest_nightly
7780
env:

Diff for: .github/workflows/java-examples.yml

+14-7
Original file line numberDiff line numberDiff line change
@@ -45,43 +45,50 @@ jobs:
4545
if: matrix.os == 'ubuntu'
4646
run: Xvfb :99 &
4747
- name: Set up Java
48+
id: java
4849
uses: actions/setup-java@v4
4950
with:
5051
distribution: 'temurin'
51-
java-version: 11
52+
java-version: 17
53+
- name: Import test cert non-Windows
54+
if: matrix.os != 'windows'
55+
run: sudo keytool -import -noprompt -trustcacerts -alias SeleniumHQ -file examples/java/src/test/resources/tls.crt -keystore ${{ steps.java.outputs.path }}/lib/security/cacerts -storepass changeit
56+
- name: Import test cert Windows
57+
if: matrix.os == 'windows'
58+
run: keytool -import -noprompt -trustcacerts -alias SeleniumHQ -file examples/java/src/test/resources/tls.crt -keystore ${{ steps.java.outputs.path }}/lib/security/cacerts -storepass changeit
5259
- name: Run Tests Stable
5360
if: matrix.release == 'stable'
5461
uses: nick-invision/[email protected]
5562
with:
56-
timeout_minutes: 20
63+
timeout_minutes: 40
5764
max_attempts: 3
5865
command: |
5966
cd examples/java
60-
mvn -B test
67+
mvn -B test -D"jdk.internal.httpclient.disableHostnameVerification=true"
6168
- name: Run Tests Nightly Linux/macOS
6269
if: matrix.release == 'nightly' && matrix.os != 'windows'
6370
uses: nick-invision/[email protected]
6471
with:
65-
timeout_minutes: 20
72+
timeout_minutes: 40
6673
max_attempts: 3
6774
command: |
6875
pip install yq
6976
xml_content=$(curl -sf https://oss.sonatype.org/service/local/repositories/snapshots/content/org/seleniumhq/selenium/selenium-java/)
7077
latest_snapshot=$(echo "$xml_content" | xq '.content.data."content-item"' | jq -r 'sort_by(.lastModified) | last | .text')
7178
echo "Latest Selenium Snapshot: $latest_snapshot"
7279
cd examples/java
73-
mvn -B -U test -Dselenium.version="$latest_snapshot"
80+
mvn -B -U test -D"jdk.internal.httpclient.disableHostnameVerification=true"
7481
7582
- name: Run Tests Nightly Windows
7683
if: matrix.release == 'nightly' && matrix.os == 'windows'
7784
uses: nick-invision/[email protected]
7885
with:
79-
timeout_minutes: 20
86+
timeout_minutes: 40
8087
max_attempts: 3
8188
command: |
8289
pip install yq
8390
$xml_content = Invoke-WebRequest -Uri "https://oss.sonatype.org/service/local/repositories/snapshots/content/org/seleniumhq/selenium/selenium-java/"
8491
$latest_snapshot = $xml_content.Content | xq '.content.data.\"content-item\"' | jq -r 'sort_by(.lastModified) | last | .text'
8592
Write-Output "Latest Selenium Snapshot: $latest_snapshot"
8693
cd examples/java
87-
mvn -B -U test "-Dselenium.version=$latest_snapshot"
94+
mvn -B -U test -D"jdk.internal.httpclient.disableHostnameVerification=true"

Diff for: .github/workflows/js-examples.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ jobs:
9393
if: matrix.release == 'nightly' && matrix.os != 'windows'
9494
run:
9595
|
96-
latest_nightly=$(./scripts/latest-nightly-version.sh npm selenium-webdriver)
96+
pip install -r ./scripts/requirements.txt
97+
latest_nightly=$(python ./scripts/latest-nightly-version.py npm selenium-webdriver)
98+
echo $latest_nightly
9799
npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly
98100
env:
99101
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -102,7 +104,8 @@ jobs:
102104
if: matrix.release == 'nightly' && matrix.os == 'windows'
103105
run:
104106
|
105-
$latest_nightly = ./scripts/latest-nightly-version.ps1 npm selenium-webdriver
107+
pip install -r ./scripts/requirements.txt
108+
$latest_nightly = python ./scripts/latest-nightly-version.py npm selenium-webdriver
106109
npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly
107110
env:
108111
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Diff for: .github/workflows/link-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- name: Link check
4444
continue-on-error: true # <- If set to false, run fails with broken links
45-
uses: untitaker/[email protected].32
45+
uses: untitaker/[email protected].43
4646
with:
4747
args: website_and_docs/public/ --check-anchors
4848

Diff for: .github/workflows/python-examples.yml

+16-5
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,24 @@ jobs:
4848
uses: actions/setup-python@v5
4949
with:
5050
python-version: 3.8
51-
- name: Install dependencies nightly
52-
if: matrix.release == 'nightly'
53-
working-directory: ./examples/python
51+
- name: Install dependencies nightly non-Windows
52+
if: matrix.release == 'nightly' && matrix.os != 'windows'
53+
run: |
54+
pip install -r ./scripts/requirements.txt
55+
latest_nightly_python=$(python ./scripts/latest-python-nightly-version.py)
56+
cd examples/python
57+
python -m pip install --upgrade pip
58+
pip install -r requirements.txt
59+
pip install --index-url https://test.pypi.org/simple/ selenium==$latest_nightly_python --extra-index-url https://pypi.org/simple/ --upgrade --force-reinstall --break-system-packages
60+
- name: Install dependencies nightly Windows
61+
if: matrix.release == 'nightly' && matrix.os == 'windows'
5462
run: |
63+
pip install -r ./scripts/requirements.txt
64+
$latest_nightly_python = python ./scripts/latest-python-nightly-version.py
65+
cd examples/python
5566
python -m pip install --upgrade pip
5667
pip install -r requirements.txt
57-
pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple --force-reinstall -v selenium
68+
pip install --index-url https://test.pypi.org/simple/ selenium==$latest_nightly_python --extra-index-url https://pypi.org/simple/ --upgrade --force-reinstall --break-system-packages
5869
- name: Install dependencies stable
5970
if: matrix.release == 'stable'
6071
working-directory: ./examples/python
@@ -69,7 +80,7 @@ jobs:
6980
- name: Run tests
7081
uses: nick-invision/[email protected]
7182
with:
72-
timeout_minutes: 20
83+
timeout_minutes: 40
7384
max_attempts: 3
7485
command: |
7586
cd examples/python

Diff for: .github/workflows/ruby-examples.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ jobs:
5353
if: matrix.release == 'nightly' && matrix.os != 'windows'
5454
run:
5555
|
56-
latest_nightly_webdriver=$(./scripts/latest-nightly-version.sh rubygems selenium-webdriver)
56+
pip install -r ./scripts/requirements.txt
57+
latest_nightly_webdriver=$(python ./scripts/latest-nightly-version.py rubygems selenium-webdriver)
58+
echo $latest_nightly_webdriver
5759
cd examples/ruby
5860
bundle install
5961
bundle remove selenium-webdriver
@@ -64,7 +66,8 @@ jobs:
6466
if: matrix.release == 'nightly' && matrix.os == 'windows'
6567
run:
6668
|
67-
$latest_nightly_webdriver = ./scripts/latest-nightly-version.ps1 rubygems selenium-webdriver
69+
pip install -r ./scripts/requirements.txt
70+
$latest_nightly_webdriver = python ./scripts/latest-nightly-version.py rubygems selenium-webdriver
6871
cd examples/ruby
6972
bundle install
7073
bundle remove selenium-webdriver

Diff for: .gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ website_and_docs/resources
1111
.settings
1212
.gitignore
1313
.pydevproject
14+
**/*.iml
15+
**/.gradle

Diff for: CONTRIBUTING.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# Contributing to the Selenium site and docs
22

3-
Please follow this [link](https://selenium.dev/documentation/about/contributing/)
4-
for all the contribution details.
3+
Please follow this [link](https://selenium.dev/documentation/about/contributing/) for all the contribution details.

Diff for: GOVERNANCE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Governance
22

3-
Content moved to https://www.selenium.dev/governance/
3+
Content moved to <https://www.selenium.dev/governance/>

Diff for: README.md

+9-16
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This is the repository used to build and publish the official Selenium [website]
1111
We use [Hugo](https://gohugo.io/) and the [Docsy theme](https://www.docsy.dev/)
1212
to build and render the site. You will need the **extended**
1313
Sass/SCSS version of the Hugo binary to work on this site. We recommend
14-
to use Hugo 0.125.4
14+
to use **[Hugo 0.125.4](https://github.com/gohugoio/hugo/releases/tag/v0.125.4)**
1515

1616
Steps needed to have this working locally and work on it:
1717

@@ -25,31 +25,26 @@ A full contribution guideline can be seen at [contributing](https://selenium.dev
2525

2626
## How to get involved?
2727

28-
Please check all the information available at https://selenium.dev/getinvolved/
28+
Please check all the information available at <https://selenium.dev/getinvolved/>
2929

30-
### Do not want to clone the repository to contribute? Use GitPod.
30+
### Do not want to clone the repository to contribute? Use GitPod
3131

3232
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/SeleniumHQ/seleniumhq.github.io)
3333

34-
3534
## For Selenium Site and Documentation maintainers
3635

3736
### How does the site and docs get build?
3837

3938
GitHub actions runs for every commit on each PR and protected branch. The regular CI execution will
4039
build the site with Hugo to verify that the commit works. The description of these steps can be seen
41-
at the actions configuration file, [one for testing a PR](./.github/workflows/test.yml), and
42-
[one for deploying the site](./.github/workflows/deploy.yml)
40+
at the actions configuration file, [one for testing a PR](./.github/workflows/test.yml), and [one for deploying the site](./.github/workflows/deploy.yml)
4341

4442
### How are the site and docs deployed?
4543

46-
After each CI execution that happens in the `trunk` branch, the script [build-site.sh](./build-site.sh)
47-
is executed for deployment. This script checks for the string `[deploy site]` in the commit message.
44+
After each CI execution that happens in the `trunk` branch, the script [build-site.sh](./build-site.sh) is executed for deployment. This script checks for the string `[deploy site]` in the commit message.
4845

49-
If the commit message contains that string, and the commit is in `trunk`, a
50-
[GitHub action](./.github/workflows/deploy.yml) is triggered to build and deploy the site.
51-
The site and docs will be built, and the changes will be committed to the branch `publish`
52-
by the user [Selenium-CI](https://github.com/selenium-ci/).
46+
If the commit message contains that string, and the commit is in `trunk`, a [GitHub action](./.github/workflows/deploy.yml) is triggered to build and deploy the site.
47+
The site and docs will be built, and the changes will be committed to the branch `publish` by the user [Selenium-CI](https://github.com/selenium-ci/).
5348

5449
*What is important to take into account is that the source files for the site are in the `trunk`
5550
branch, and the files that get deployed are pushed to the `publish` branch.*
@@ -59,11 +54,9 @@ repo [settings](https://github.com/SeleniumHQ/seleniumhq.github.io/settings) (if
5954
you should be able to access the link).
6055

6156
The selenium.
62-
domain is managed at https://www.gandi.net/en, if you need access to it, reach out to
63-
any of the [PLC](https://www.selenium.dev/project/structure/#plc) or [TLC](https://www.selenium.dev/project/structure/#tlc)
57+
domain is managed at <https://www.gandi.net/en>, if you need access to it, reach out to any of the [PLC](https://www.selenium.dev/project/structure/#plc) or [TLC](https://www.selenium.dev/project/structure/#tlc)
6458
members, who can help you with that.
6559

6660
If for any reason, you need to setup the domain redirection again,
6761
we followed this [guide](http://spector.io/how-to-set-up-github-pages-with-a-custom-domain-on-gandi/),
68-
but any tutorial/guide showing how to redirect a domain to GitHub pages should do.
69-
62+
but any tutorial/guide showing how to redirect a domain to GitHub pages should do.

Diff for: examples/dotnet/SeleniumDocs/BaseTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class BaseTest
1717
protected IWebDriver driver;
1818
protected Uri GridUrl;
1919
private Process _webserverProcess;
20-
private const string ServerJarName = "selenium-server-4.25.0.jar";
20+
private const string ServerJarName = "selenium-server-4.26.0.jar";
2121
private static readonly string BaseDirectory = AppContext.BaseDirectory;
2222
private const string RelativePathToGrid = "../../../../../";
2323
private readonly string _examplesDirectory = Path.GetFullPath(Path.Combine(BaseDirectory, RelativePathToGrid));

Diff for: examples/dotnet/SeleniumDocs/BiDi/CDP/NetworkTest.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using OpenQA.Selenium;
55
using OpenQA.Selenium.DevTools;
66
using System.Linq;
7-
using OpenQA.Selenium.DevTools.V129.Network;
8-
using OpenQA.Selenium.DevTools.V129.Performance;
7+
using OpenQA.Selenium.DevTools.V130.Network;
8+
using OpenQA.Selenium.DevTools.V130.Performance;
99

1010

1111
namespace SeleniumDocs.BiDi.CDP
@@ -16,7 +16,7 @@ public class NetworkTest : BaseTest
1616
[TestInitialize]
1717
public void Startup()
1818
{
19-
StartDriver("129");
19+
StartDriver("130");
2020
}
2121

2222
[TestMethod]
@@ -109,9 +109,9 @@ public async Task PerformanceMetrics()
109109
driver.Url = "https://www.selenium.dev/selenium/web/frameset.html";
110110

111111
var session = ((IDevTools)driver).GetDevToolsSession();
112-
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V129.DevToolsSessionDomains>();
112+
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V130.DevToolsSessionDomains>();
113113

114-
await domains.Performance.Enable(new OpenQA.Selenium.DevTools.V129.Performance.EnableCommandSettings());
114+
await domains.Performance.Enable(new OpenQA.Selenium.DevTools.V130.Performance.EnableCommandSettings());
115115
var metricsResponse =
116116
await session.SendCommand<GetMetricsCommandSettings, GetMetricsCommandResponse>(
117117
new GetMetricsCommandSettings()
@@ -130,8 +130,8 @@ await session.SendCommand<GetMetricsCommandSettings, GetMetricsCommandResponse>(
130130
public async Task SetCookie()
131131
{
132132
var session = ((IDevTools)driver).GetDevToolsSession();
133-
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V129.DevToolsSessionDomains>();
134-
await domains.Network.Enable(new OpenQA.Selenium.DevTools.V129.Network.EnableCommandSettings());
133+
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V130.DevToolsSessionDomains>();
134+
await domains.Network.Enable(new OpenQA.Selenium.DevTools.V130.Network.EnableCommandSettings());
135135

136136
var cookieCommandSettings = new SetCookieCommandSettings
137137
{

0 commit comments

Comments
 (0)