Skip to content

Commit

Permalink
Merge branch 'trunk' into petesong/add-practice-example
Browse files Browse the repository at this point in the history
  • Loading branch information
PeteSong authored Nov 1, 2024
2 parents 5bb14ff + 6e06acf commit 1c8174a
Show file tree
Hide file tree
Showing 43 changed files with 427 additions and 516 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/link-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- name: Link check
continue-on-error: true # <- If set to false, run fails with broken links
uses: untitaker/[email protected].40
uses: untitaker/[email protected].42
with:
args: website_and_docs/public/ --check-anchors

Expand Down
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Contributing to the Selenium site and docs

Please follow this [link](https://selenium.dev/documentation/about/contributing/)
for all the contribution details.
Please follow this [link](https://selenium.dev/documentation/about/contributing/) for all the contribution details.
2 changes: 1 addition & 1 deletion GOVERNANCE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Governance

Content moved to https://www.selenium.dev/governance/
Content moved to <https://www.selenium.dev/governance/>
23 changes: 8 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,26 @@ A full contribution guideline can be seen at [contributing](https://selenium.dev

## How to get involved?

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

### Do not want to clone the repository to contribute? Use GitPod.
### Do not want to clone the repository to contribute? Use GitPod

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


## For Selenium Site and Documentation maintainers

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

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

### How are the site and docs deployed?

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

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

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

The selenium.
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)
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)
members, who can help you with that.

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

but any tutorial/guide showing how to redirect a domain to GitHub pages should do.
2 changes: 1 addition & 1 deletion examples/dotnet/SeleniumDocs/BaseTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class BaseTest
protected IWebDriver driver;
protected Uri GridUrl;
private Process _webserverProcess;
private const string ServerJarName = "selenium-server-4.25.0.jar";
private const string ServerJarName = "selenium-server-4.26.0.jar";
private static readonly string BaseDirectory = AppContext.BaseDirectory;
private const string RelativePathToGrid = "../../../../../";
private readonly string _examplesDirectory = Path.GetFullPath(Path.Combine(BaseDirectory, RelativePathToGrid));
Expand Down
14 changes: 7 additions & 7 deletions examples/dotnet/SeleniumDocs/BiDi/CDP/NetworkTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
using OpenQA.Selenium;
using OpenQA.Selenium.DevTools;
using System.Linq;
using OpenQA.Selenium.DevTools.V129.Network;
using OpenQA.Selenium.DevTools.V129.Performance;
using OpenQA.Selenium.DevTools.V130.Network;
using OpenQA.Selenium.DevTools.V130.Performance;


namespace SeleniumDocs.BiDi.CDP
Expand All @@ -16,7 +16,7 @@ public class NetworkTest : BaseTest
[TestInitialize]
public void Startup()
{
StartDriver("129");
StartDriver("130");
}

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

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

await domains.Performance.Enable(new OpenQA.Selenium.DevTools.V129.Performance.EnableCommandSettings());
await domains.Performance.Enable(new OpenQA.Selenium.DevTools.V13.Performance.EnableCommandSettings());
var metricsResponse =
await session.SendCommand<GetMetricsCommandSettings, GetMetricsCommandResponse>(
new GetMetricsCommandSettings()
Expand All @@ -130,8 +130,8 @@ await session.SendCommand<GetMetricsCommandSettings, GetMetricsCommandResponse>(
public async Task SetCookie()
{
var session = ((IDevTools)driver).GetDevToolsSession();
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V129.DevToolsSessionDomains>();
await domains.Network.Enable(new OpenQA.Selenium.DevTools.V129.Network.EnableCommandSettings());
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V130.DevToolsSessionDomains>();
await domains.Network.Enable(new OpenQA.Selenium.DevTools.V130.Network.EnableCommandSettings());

var cookieCommandSettings = new SetCookieCommandSettings
{
Expand Down
2 changes: 1 addition & 1 deletion examples/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories {
}

dependencies {
testImplementation 'org.seleniumhq.selenium:selenium-java:4.25.0'
testImplementation 'org.seleniumhq.selenium:selenium-java:4.26.0'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
}

Expand Down
2 changes: 1 addition & 1 deletion examples/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<selenium.version>4.25.0</selenium.version>
<selenium.version>4.26.0</selenium.version>
</properties>

<repositories>
Expand Down
31 changes: 15 additions & 16 deletions examples/javascript/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/javascript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"license": "Apache-2.0",
"dependencies": {
"assert": "2.1.0",
"selenium-webdriver": "4.25.0"
"selenium-webdriver": "4.26.0"
},
"devDependencies": {
"mocha": "10.7.3"
Expand Down
2 changes: 1 addition & 1 deletion examples/kotlin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>

<java.version>1.8</java.version>
<selenium.version>4.25.0</selenium.version>
<selenium.version>4.26.0</selenium.version>

<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion examples/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
selenium==4.25.0
selenium==4.26.1
pytest
trio
pytest-trio
Expand Down
4 changes: 2 additions & 2 deletions examples/python/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def server_old(request):
os.path.abspath(__file__)
)
),
"selenium-server-4.25.0.jar",
"selenium-server-4.26.0.jar",
)

def wait_for_server(url, timeout):
Expand Down Expand Up @@ -198,7 +198,7 @@ def server():
)
)
),
"selenium-server-4.25.0.jar",
"selenium-server-4.26.0.jar",
)

args = [
Expand Down
4 changes: 2 additions & 2 deletions examples/python/tests/drivers/test_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ def test_set_browser_name():

def test_set_browser_version():
options = webdriver.ChromeOptions()
options.browser_version = 'latest'
assert options.capabilities['browserVersion'] == 'latest'
options.browser_version = 'stable'
assert options.capabilities['browserVersion'] == 'stable'
driver = webdriver.Chrome(options=options)
driver.get("https://www.selenium.dev/")
driver.quit()
Expand Down
2 changes: 1 addition & 1 deletion examples/python/tests/drivers/test_remote_webdriver.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_start_remote(server):
options = webdriver.ChromeOptions()
driver = webdriver.Remote(command_executor=server, options=options)

assert "localhost" in driver.command_executor._url
assert "localhost" in driver.command_executor._client_config.remote_server_addr
driver.quit()


Expand Down
4 changes: 2 additions & 2 deletions examples/ruby/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ gem 'rake', '~> 13.0'
gem 'rspec', '~> 3.0'
gem 'rubocop', '~> 1.35'
gem 'rubocop-rspec', '~> 3.0'
gem 'selenium-devtools', '= 0.129.0'
gem 'selenium-webdriver', '= 4.25.0'
gem 'selenium-devtools', '= 0.130.0'
gem 'selenium-webdriver', '= 4.26.0'
16 changes: 8 additions & 8 deletions examples/ruby/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GEM
ast (2.4.2)
base64 (0.2.0)
diff-lcs (1.5.1)
json (2.7.2)
json (2.7.5)
language_server-protocol (3.17.0.3)
logger (1.6.1)
parallel (1.26.3)
Expand All @@ -15,7 +15,7 @@ GEM
rainbow (3.1.1)
rake (13.2.1)
regexp_parser (2.9.2)
rexml (3.3.7)
rexml (3.3.9)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand All @@ -29,7 +29,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.0)
rubocop (1.67.0)
rubocop (1.68.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -39,15 +39,15 @@ GEM
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.3)
rubocop-ast (1.33.0)
parser (>= 3.3.1.0)
rubocop-rspec (3.1.0)
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
rubyzip (2.3.2)
selenium-devtools (0.129.0)
selenium-devtools (0.130.0)
selenium-webdriver (~> 4.2)
selenium-webdriver (4.25.0)
selenium-webdriver (4.26.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
Expand All @@ -70,8 +70,8 @@ DEPENDENCIES
rspec (~> 3.0)
rubocop (~> 1.35)
rubocop-rspec (~> 3.0)
selenium-devtools (= 0.129.0)
selenium-webdriver (= 4.25.0)
selenium-devtools (= 0.130.0)
selenium-webdriver (= 4.26.0)

BUNDLED WITH
2.5.6
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -221,13 +221,14 @@ pull request updating this page.
| `--register-cycle` | int | `10` | How often, in seconds, the Node will try to register itself for the first time to the Distributor. |
| `--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. |
| `--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. |
| `--vnc-env-var`| string | `START_XVFB` | Environment variable to check in order to determine if a vnc stream is available or not. |
| `--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. |
| `--no-vnc-port`| int | `7900` | If VNC is available, sets the port where the local noVNC stream can be obtained |
| `--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. |
| `--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. |
| `--enable-cdp`| boolean | `true` | Enable CDP proxying in Grid. A Grid admin can disable CDP if the network doesnot allow websockets. True by default. |
| `--enable-managed-downloads`| boolean | `false` | This causes the Node to auto manage files downloaded for a given session on the Node. |
| `--selenium-manager`| boolean | `false` | When drivers are not available on the current system, use Selenium Manager. False by default. |
| `--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. |

### Relay

Expand Down
Loading

0 comments on commit 1c8174a

Please sign in to comment.