Skip to content

Commit 42bade2

Browse files
authored
Merge branch 'trunk' into renovate/mocha-10.x
2 parents cbba0e2 + bea771c commit 42bade2

File tree

21 files changed

+68
-73
lines changed

21 files changed

+68
-73
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
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.

GOVERNANCE.md

Lines changed: 1 addition & 1 deletion
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/>

README.md

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -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.

examples/dotnet/SeleniumDocs/BaseTest.cs

Lines changed: 1 addition & 1 deletion
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));

examples/dotnet/SeleniumDocs/BiDi/CDP/NetworkTest.cs

Lines changed: 7 additions & 7 deletions
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.V13.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
{

examples/java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories {
1010
}
1111

1212
dependencies {
13-
testImplementation 'org.seleniumhq.selenium:selenium-java:4.25.0'
13+
testImplementation 'org.seleniumhq.selenium:selenium-java:4.26.0'
1414
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
1515
}
1616

examples/java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<selenium.version>4.25.0</selenium.version>
16+
<selenium.version>4.26.0</selenium.version>
1717
</properties>
1818

1919
<repositories>

examples/javascript/package-lock.json

Lines changed: 15 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/javascript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"license": "Apache-2.0",
99
"dependencies": {
1010
"assert": "2.1.0",
11-
"selenium-webdriver": "4.25.0"
11+
"selenium-webdriver": "4.26.0"
1212
},
1313
"devDependencies": {
1414
"mocha": "10.8.1"

examples/kotlin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
2121

2222
<java.version>1.8</java.version>
23-
<selenium.version>4.25.0</selenium.version>
23+
<selenium.version>4.26.0</selenium.version>
2424

2525
<maven.compiler.target>${java.version}</maven.compiler.target>
2626
<maven.compiler.source>${java.version}</maven.compiler.source>

examples/python/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
selenium==4.25.0
1+
selenium==4.26.0
22
pytest
33
trio
44
pytest-trio

examples/python/tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def server_old(request):
140140
os.path.abspath(__file__)
141141
)
142142
),
143-
"selenium-server-4.25.0.jar",
143+
"selenium-server-4.26.0.jar",
144144
)
145145

146146
def wait_for_server(url, timeout):
@@ -198,7 +198,7 @@ def server():
198198
)
199199
)
200200
),
201-
"selenium-server-4.25.0.jar",
201+
"selenium-server-4.26.0.jar",
202202
)
203203

204204
args = [

examples/ruby/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ gem 'rake', '~> 13.0'
77
gem 'rspec', '~> 3.0'
88
gem 'rubocop', '~> 1.35'
99
gem 'rubocop-rspec', '~> 3.0'
10-
gem 'selenium-devtools', '= 0.129.0'
11-
gem 'selenium-webdriver', '= 4.25.0'
10+
gem 'selenium-devtools', '= 0.130.0'
11+
gem 'selenium-webdriver', '= 4.26.0'

examples/ruby/Gemfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ GEM
1515
rainbow (3.1.1)
1616
rake (13.2.1)
1717
regexp_parser (2.9.2)
18-
rexml (3.3.7)
18+
rexml (3.3.9)
1919
rspec (3.13.0)
2020
rspec-core (~> 3.13.0)
2121
rspec-expectations (~> 3.13.0)
@@ -45,9 +45,9 @@ GEM
4545
rubocop (~> 1.61)
4646
ruby-progressbar (1.13.0)
4747
rubyzip (2.3.2)
48-
selenium-devtools (0.129.0)
48+
selenium-devtools (0.130.0)
4949
selenium-webdriver (~> 4.2)
50-
selenium-webdriver (4.25.0)
50+
selenium-webdriver (4.26.0)
5151
base64 (~> 0.2)
5252
logger (~> 1.4)
5353
rexml (~> 3.2, >= 3.2.5)
@@ -70,8 +70,8 @@ DEPENDENCIES
7070
rspec (~> 3.0)
7171
rubocop (~> 1.35)
7272
rubocop-rspec (~> 3.0)
73-
selenium-devtools (= 0.129.0)
74-
selenium-webdriver (= 4.25.0)
73+
selenium-devtools (= 0.130.0)
74+
selenium-webdriver (= 4.26.0)
7575

7676
BUNDLED WITH
7777
2.5.6

website_and_docs/content/documentation/grid/configuration/cli_options.en.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,14 @@ pull request updating this page.
221221
| `--register-cycle` | int | `10` | How often, in seconds, the Node will try to register itself for the first time to the Distributor. |
222222
| `--register-period` | int | `120` | How long, in seconds, will the Node try to register to the Distributor for the first time. After this period is completed, the Node will not attempt to register again. |
223223
| `--session-timeout` | int | `300` | Let X be the session-timeout in seconds. The Node will automatically kill a session that has not had any activity in the last X seconds. This will release the slot for other tests. |
224-
| `--vnc-env-var`| string | `START_XVFB` | Environment variable to check in order to determine if a vnc stream is available or not. |
224+
| `--vnc-env-var`| string[] | `SE_START_XVFB SE_START_VNC SE_START_NO_VNC` | Environment variable to check in order to determine if a vnc stream is available or not. |
225225
| `--no-vnc-port`| int | `7900` | If VNC is available, sets the port where the local noVNC stream can be obtained |
226226
| `--drain-after-session-count`| int | `1` | Drain and shutdown the Node after X sessions have been executed. Useful for environments like Kubernetes. A value higher than zero enables this feature. |
227227
| `--hub`| string | `http://localhost:4444` | The address of the Hub in a Hub-and-Node configuration. Can be a hostname or IP address (`hostname`), in which case the Hub will be assumed to be `http://hostname:4444`, the `--grid-url` will be the same `--publish-events` will be `tcp://hostname:4442` and `--subscribe-events` will be `tcp://hostname:4443`. If `hostname` contains a port number, that will be used for `--grid-url` but the URIs for the event bus will remain the same. Any of these default values may be overridden but setting the correct flags. If the hostname has a protocol (such as `https`) that will be used too. |
228228
| `--enable-cdp`| boolean | `true` | Enable CDP proxying in Grid. A Grid admin can disable CDP if the network doesnot allow websockets. True by default. |
229229
| `--enable-managed-downloads`| boolean | `false` | This causes the Node to auto manage files downloaded for a given session on the Node. |
230230
| `--selenium-manager`| boolean | `false` | When drivers are not available on the current system, use Selenium Manager. False by default. |
231+
| `--connection-limit-per-session` | int | `10` | Let X be the maximum number of websocket connections per session.This will ensure one session is not able to exhaust the connection limit of the host. |
231232

232233
### Relay
233234

0 commit comments

Comments
 (0)