Skip to content

Commit aea9805

Browse files
shbenzershbenzer
authored
Merge branch 'trunk' into javascript-example-selenium-manager
2 parents 88d8202 + 3084f59 commit aea9805

File tree

97 files changed

+1066
-534
lines changed

Some content is hidden

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

97 files changed

+1066
-534
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
distribution: 'temurin'
8686
java-version: 11
8787
- name: Run tests
88-
uses: nick-fields/[email protected].0
88+
uses: nick-fields/[email protected].2
8989
with:
9090
timeout_minutes: 20
9191
max_attempts: 3

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
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
5959
- name: Run Tests Stable
6060
if: matrix.release == 'stable'
61-
uses: nick-invision/[email protected].0
61+
uses: nick-invision/[email protected].2
6262
with:
6363
timeout_minutes: 40
6464
max_attempts: 3
@@ -67,7 +67,7 @@ jobs:
6767
mvn -B test -D"jdk.internal.httpclient.disableHostnameVerification=true"
6868
- name: Run Tests Nightly Linux/macOS
6969
if: matrix.release == 'nightly' && matrix.os != 'windows'
70-
uses: nick-invision/[email protected].0
70+
uses: nick-invision/[email protected].2
7171
with:
7272
timeout_minutes: 40
7373
max_attempts: 3
@@ -81,7 +81,7 @@ jobs:
8181
8282
- name: Run Tests Nightly Windows
8383
if: matrix.release == 'nightly' && matrix.os == 'windows'
84-
uses: nick-invision/[email protected].0
84+
uses: nick-invision/[email protected].2
8585
with:
8686
timeout_minutes: 40
8787
max_attempts: 3

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ jobs:
8282
if: matrix.release == 'stable'
8383
uses: actions/setup-node@v4
8484
with:
85-
node-version: '18.x'
85+
node-version: '22.x'
8686
- name: Setup Node Nightly
8787
if: matrix.release == 'nightly'
8888
uses: actions/setup-node@v4
8989
with:
90-
node-version: '18.x'
90+
node-version: '22.x'
9191
registry-url: 'https://npm.pkg.github.com'
9292
- name: Use Nightly package.json in Ubuntu/macOS
9393
if: matrix.release == 'nightly' && matrix.os != 'windows'
@@ -116,7 +116,7 @@ jobs:
116116
env:
117117
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
118118
- name: Run tests
119-
uses: nick-invision/[email protected].0
119+
uses: nick-invision/[email protected].2
120120
with:
121121
timeout_minutes: 20
122122
max_attempts: 3

Diff for: ‎.github/workflows/kotlin-examples.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
distribution: 'temurin'
8484
java-version: 11
8585
- name: Run tests
86-
uses: nick-invision/[email protected].0
86+
uses: nick-invision/[email protected].2
8787
with:
8888
timeout_minutes: 20
8989
max_attempts: 3

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].43
45+
uses: untitaker/[email protected].44
4646
with:
4747
args: website_and_docs/public/ --check-anchors
4848

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
include:
2929
- os: ubuntu
3030
release: stable
31-
python: '3.8'
31+
python: '3.9'
3232
- os: ubuntu
3333
release: nightly
3434
python: '3.11'
@@ -95,7 +95,7 @@ jobs:
9595
distribution: 'temurin'
9696
java-version: 11
9797
- name: Run tests
98-
uses: nick-invision/[email protected].0
98+
uses: nick-invision/[email protected].2
9999
with:
100100
timeout_minutes: 60
101101
max_attempts: 3

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
distribution: 'temurin'
8585
java-version: 11
8686
- name: Run tests
87-
uses: nick-invision/[email protected].0
87+
uses: nick-invision/[email protected].2
8888
with:
8989
timeout_minutes: 20
9090
max_attempts: 3

Diff for: ‎README.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
[![GitHub Actions](https://github.com/seleniumhq/seleniumhq.github.io/workflows/Publish%20Selenium%20Site/badge.svg)](https://github.com/SeleniumHQ/seleniumhq.github.io/actions?query=workflow%3A%22Publish+Selenium+Site%22)
2+
[![Run Java examples](https://github.com/SeleniumHQ/seleniumhq.github.io/actions/workflows/java-examples.yml/badge.svg)](https://github.com/SeleniumHQ/seleniumhq.github.io/actions/workflows/java-examples.yml)
3+
[![Run Kotlin examples](https://github.com/SeleniumHQ/seleniumhq.github.io/actions/workflows/kotlin-examples.yml/badge.svg)](https://github.com/SeleniumHQ/seleniumhq.github.io/actions/workflows/kotlin-examples.yml)
4+
[![Run Python examples](https://github.com/SeleniumHQ/seleniumhq.github.io/actions/workflows/python-examples.yml/badge.svg)](https://github.com/SeleniumHQ/seleniumhq.github.io/actions/workflows/python-examples.yml)
5+
[![Run JavaScript examples](https://github.com/SeleniumHQ/seleniumhq.github.io/actions/workflows/js-examples.yml/badge.svg)](https://github.com/SeleniumHQ/seleniumhq.github.io/actions/workflows/js-examples.yml)
6+
[![Run Ruby examples](https://github.com/SeleniumHQ/seleniumhq.github.io/actions/workflows/ruby-examples.yml/badge.svg)](https://github.com/SeleniumHQ/seleniumhq.github.io/actions/workflows/ruby-examples.yml)
7+
[![Run DotNet examples](https://github.com/SeleniumHQ/seleniumhq.github.io/actions/workflows/dotnet-examples.yml/badge.svg)](https://github.com/SeleniumHQ/seleniumhq.github.io/actions/workflows/dotnet-examples.yml)
28

39
<a href="https://selenium.dev"><img src="https://selenium.dev/images/selenium_logo_square_green.png" width="200" alt="Selenium"/></a>
410

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.27.0.jar";
20+
private const string ServerJarName = "selenium-server-4.29.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

+9-9
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.V131.Network;
8-
using OpenQA.Selenium.DevTools.V131.Performance;
7+
using OpenQA.Selenium.DevTools.V132.Network;
8+
using OpenQA.Selenium.DevTools.V132.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("131");
19+
StartDriver("132");
2020
}
2121

2222
[TestMethod]
@@ -37,7 +37,7 @@ public async Task BasicAuthentication()
3737
Assert.AreEqual("Congratulations! You must have the proper credentials.",
3838
driver.FindElement(By.TagName("p")).Text);
3939
}
40-
40+
4141
[TestMethod]
4242
public async Task RecordNetworkResponse()
4343
{
@@ -102,16 +102,16 @@ public async Task TransformNetworkRequest()
102102

103103
Assert.AreEqual("two", driver.FindElement(By.Id("result")).Text);
104104
}
105-
105+
106106
[TestMethod]
107107
public async Task PerformanceMetrics()
108108
{
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.V131.DevToolsSessionDomains>();
112+
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V132.DevToolsSessionDomains>();
113113

114-
await domains.Performance.Enable(new OpenQA.Selenium.DevTools.V131.Performance.EnableCommandSettings());
114+
await domains.Performance.Enable(new OpenQA.Selenium.DevTools.V132.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.V131.DevToolsSessionDomains>();
134-
await domains.Network.Enable(new OpenQA.Selenium.DevTools.V131.Network.EnableCommandSettings());
133+
var domains = session.GetVersionSpecificDomains<OpenQA.Selenium.DevTools.V132.DevToolsSessionDomains>();
134+
await domains.Network.Enable(new OpenQA.Selenium.DevTools.V132.Network.EnableCommandSettings());
135135

136136
var cookieCommandSettings = new SetCookieCommandSettings
137137
{

Diff for: ‎examples/dotnet/SeleniumDocs/Interactions/VirtualAuthenticatorTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void ShouldBeAbleToRemoveAuthenticator()
8686
((WebDriver)driver).RemoveVirtualAuthenticator(virtualAuthenticatorId);
8787

8888
// Since the authenticator was removed, any operation using it will throw an error
89-
Assert.ThrowsException<WebDriverArgumentException>(() => ((WebDriver)driver).GetCredentials());
89+
Assert.ThrowsException<InvalidOperationException>(() => ((WebDriver)driver).GetCredentials());
9090
}
9191

9292
[TestMethod]

Diff for: ‎examples/dotnet/SeleniumDocs/SeleniumDocs.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.7.1" />
1111
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
1212
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
13-
<PackageReference Include="Selenium.Support" Version="4.27.0" />
14-
<PackageReference Include="Selenium.WebDriver" Version="4.27.0" />
13+
<PackageReference Include="Selenium.Support" Version="4.29.0" />
14+
<PackageReference Include="Selenium.WebDriver" Version="4.29.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

Diff for: ‎examples/java/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ repositories {
1010
}
1111

1212
dependencies {
13-
testImplementation 'org.seleniumhq.selenium:selenium-java:4.27.0'
14-
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.4'
13+
testImplementation 'org.seleniumhq.selenium:selenium-java:4.29.0'
14+
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.12.0'
1515
}
1616

1717
test {

Diff for: ‎examples/java/gradle/wrapper/gradle-wrapper.jar

122 Bytes
Binary file not shown.

Diff for: ‎examples/java/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

Diff for: ‎examples/java/gradlew

+2-3
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.

Diff for: ‎examples/java/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<maven.compiler.source>17</maven.compiler.source>
1414
<maven.compiler.target>17</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<selenium.version>4.27.0</selenium.version>
16+
<selenium.version>4.29.0</selenium.version>
1717
</properties>
1818

1919
<repositories>
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>org.junit.jupiter</groupId>
4242
<artifactId>junit-jupiter-engine</artifactId>
43-
<version>5.11.4</version>
43+
<version>5.12.0</version>
4444
<scope>test</scope>
4545
</dependency>
4646
<dependency>
@@ -66,6 +66,7 @@
6666
junit.jupiter.execution.parallel.config.fixed.max-pool-size = ${surefire.parallel}
6767
</configurationParameters>
6868
</properties>
69+
<rerunFailingTestsCount>3</rerunFailingTestsCount>
6970
</configuration>
7071
</plugin>
7172
</plugins>

Diff for: ‎examples/java/src/test/java/dev/selenium/BaseTest.java

+13
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.openqa.selenium.WebElement;
1717
import org.openqa.selenium.chrome.ChromeDriver;
1818
import org.openqa.selenium.chrome.ChromeOptions;
19+
import org.openqa.selenium.edge.EdgeOptions;
1920
import org.openqa.selenium.firefox.FirefoxDriver;
2021
import org.openqa.selenium.firefox.FirefoxOptions;
2122
import org.openqa.selenium.grid.Main;
@@ -57,6 +58,18 @@ protected ChromeDriver startChromeDriver(ChromeOptions options) {
5758
return (ChromeDriver) driver;
5859
}
5960

61+
protected static ChromeOptions getDefaultChromeOptions() {
62+
ChromeOptions options = new ChromeOptions();
63+
options.addArguments("--no-sandbox");
64+
return options;
65+
}
66+
67+
protected static EdgeOptions getDefaultEdgeOptions() {
68+
EdgeOptions options = new EdgeOptions();
69+
options.addArguments("--no-sandbox");
70+
return options;
71+
}
72+
6073
protected File getTempDirectory(String prefix) {
6174
File tempDirectory = null;
6275
try {

Diff for: ‎examples/java/src/test/java/dev/selenium/bidi/cdp/CdpApiTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class CdpApiTest extends BaseTest {
2626

2727
@BeforeEach
2828
public void createSession() {
29-
ChromeOptions options = new ChromeOptions();
29+
ChromeOptions options = getDefaultChromeOptions();
3030
options.setBrowserVersion("131");
3131
driver = new ChromeDriver(options);
3232
wait = new WebDriverWait(driver, Duration.ofSeconds(10));

Diff for: ‎examples/java/src/test/java/dev/selenium/browsers/ChromeTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ public void clearProperties() {
3434

3535
@Test
3636
public void basicOptions() {
37-
ChromeOptions options = new ChromeOptions();
37+
ChromeOptions options = getDefaultChromeOptions();
3838
driver = new ChromeDriver(options);
3939
}
4040

4141
@Test
4242
public void arguments() {
43-
ChromeOptions options = new ChromeOptions();
43+
ChromeOptions options = getDefaultChromeOptions();
4444

4545
options.addArguments("--start-maximized");
4646

@@ -49,7 +49,7 @@ public void arguments() {
4949

5050
@Test
5151
public void setBrowserLocation() {
52-
ChromeOptions options = new ChromeOptions();
52+
ChromeOptions options = getDefaultChromeOptions();
5353

5454
options.setBinary(getChromeLocation());
5555

@@ -58,7 +58,7 @@ public void setBrowserLocation() {
5858

5959
@Test
6060
public void extensionOptions() {
61-
ChromeOptions options = new ChromeOptions();
61+
ChromeOptions options = getDefaultChromeOptions();
6262
Path path = Paths.get("src/test/resources/extensions/webextensions-selenium-example.crx");
6363
File extensionFilePath = new File(path.toUri());
6464

@@ -73,7 +73,7 @@ public void extensionOptions() {
7373

7474
@Test
7575
public void excludeSwitches() {
76-
ChromeOptions options = new ChromeOptions();
76+
ChromeOptions options = getDefaultChromeOptions();
7777

7878
options.setExperimentalOption("excludeSwitches", List.of("disable-popup-blocking"));
7979

@@ -82,7 +82,7 @@ public void excludeSwitches() {
8282

8383
@Test
8484
public void loggingPreferences() {
85-
ChromeOptions options = new ChromeOptions();
85+
ChromeOptions options = getDefaultChromeOptions();
8686
LoggingPreferences logPrefs = new LoggingPreferences();
8787
logPrefs.enable(LogType.PERFORMANCE, Level.ALL);
8888
options.setCapability(ChromeOptions.LOGGING_PREFS, logPrefs);
@@ -175,7 +175,7 @@ public void disableBuildChecks() throws IOException {
175175
}
176176

177177
private File getChromeLocation() {
178-
ChromeOptions options = new ChromeOptions();
178+
ChromeOptions options = getDefaultChromeOptions();
179179
options.setBrowserVersion("stable");
180180
DriverFinder finder = new DriverFinder(ChromeDriverService.createDefaultService(), options);
181181
return new File(finder.getBrowserPath());

0 commit comments

Comments
 (0)