Skip to content

Commit e507ba1

Browse files
authored
Merge branch 'trunk' into patch-1
2 parents 50155be + c5b7acc commit e507ba1

27 files changed

+367
-225
lines changed

.github/workflows/ruby-examples.yml

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,17 @@ jobs:
4141
if: matrix.os != 'windows'
4242
run: |
4343
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
44-
- name: Start Xvfb
45-
if: matrix.os == 'ubuntu'
46-
run: Xvfb :99 &
44+
- name: Setup Fluxbox and Xvfb
45+
if: inputs.os == 'ubuntu'
46+
run: |
47+
sudo apt-get -y install fluxbox libxss1 libappindicator3-1 libindicator7
48+
Xvfb :99 &
49+
fluxbox -display :99 &
50+
echo "DISPLAY=:99" >> "$GITHUB_ENV"
4751
- name: Set up Ruby
4852
uses: ruby/setup-ruby@v1
4953
with:
50-
ruby-version: 3.0
54+
ruby-version: 3.1
5155
bundler-cache: true
5256
- name: Install Gems Nightly non-Windows
5357
if: matrix.release == 'nightly' && matrix.os != 'windows'
@@ -83,11 +87,26 @@ jobs:
8387
with:
8488
distribution: 'temurin'
8589
java-version: 11
86-
- name: Run tests
90+
- name: Run tests on Windows
91+
if: matrix.os == 'windows'
92+
uses: nick-invision/[email protected]
93+
with:
94+
timeout_minutes: 20
95+
max_attempts: 2
96+
command: |
97+
cd examples/ruby
98+
bundle exec rspec
99+
new_command_on_retry: |
100+
cd examples/ruby; $env:DEBUG="true"; bundle exec rspec --only-failures
101+
- name: Run tests on ${{ matrix.os }}
102+
if: matrix.os != 'windows'
87103
uses: nick-invision/[email protected]
88104
with:
89105
timeout_minutes: 20
90-
max_attempts: 3
106+
max_attempts: 2
91107
command: |
92108
cd examples/ruby
93109
bundle exec rspec
110+
new_command_on_retry: |
111+
cd examples/ruby
112+
DEBUG=true bundle exec rspec --only-failures

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.30.0.jar";
20+
private const string ServerJarName = "selenium-server-4.31.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/SeleniumDocs.csproj

Lines changed: 2 additions & 2 deletions
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.30.0" />
14-
<PackageReference Include="Selenium.WebDriver" Version="4.30.0" />
13+
<PackageReference Include="Selenium.Support" Version="4.31.0" />
14+
<PackageReference Include="Selenium.WebDriver" Version="4.31.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

examples/java/build.gradle

Lines changed: 2 additions & 2 deletions
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.30.0'
14-
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.12.0'
13+
testImplementation 'org.seleniumhq.selenium:selenium-java:4.31.0'
14+
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.12.1'
1515
}
1616

1717
test {

examples/java/pom.xml

Lines changed: 3 additions & 3 deletions
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.30.0</selenium.version>
16+
<selenium.version>4.31.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.12.0</version>
43+
<version>5.12.1</version>
4444
<scope>test</scope>
4545
</dependency>
4646
<dependency>
@@ -55,7 +55,7 @@
5555
<plugin>
5656
<groupId>org.apache.maven.plugins</groupId>
5757
<artifactId>maven-surefire-plugin</artifactId>
58-
<version>3.5.2</version>
58+
<version>3.5.3</version>
5959
<configuration>
6060
<properties>
6161
<configurationParameters>

examples/javascript/package-lock.json

Lines changed: 7 additions & 8 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.30.0"
11+
"selenium-webdriver": "4.31.0"
1212
},
1313
"devDependencies": {
1414
"mocha": "11.1.0"

examples/javascript/test/bidirectional/network_events.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const assert = require("assert");
22
const firefox = require('selenium-webdriver/firefox');
3-
const Network = require("selenium-webdriver/bidi/network");
3+
const { Network } = require("selenium-webdriver/bidi/network");
44
const {until, Builder} = require("selenium-webdriver");
55

66

@@ -76,7 +76,7 @@ describe('Network events', function () {
7676
assert.equal(beforeRequestEvent[0].request.method, 'GET')
7777
assert(beforeRequestEvent[0].request.url.includes('redirected_http_equiv.html'))
7878
assert.equal(beforeRequestEvent[2].request.method, 'GET')
79-
assert(beforeRequestEvent[2].request.url.includes('redirected.html'))
79+
assert(beforeRequestEvent[3].request.url.includes('redirected.html'))
8080
})
8181

8282
it('can subscribe to response started', async function () {

examples/kotlin/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
<slf4j.version>2.0.17</slf4j.version>
1515
<logback.version>1.5.18</logback.version>
1616

17-
<junit5.version>5.12.0</junit5.version>
17+
<junit5.version>5.12.1</junit5.version>
1818
<wdm.version>5.2.3</wdm.version>
1919

2020
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
2121

2222
<java.version>1.8</java.version>
23-
<selenium.version>4.30.0</selenium.version>
23+
<selenium.version>4.31.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.30.0
1+
selenium==4.31.0
22
pytest==8.3.5
33
trio==0.29.0
44
pytest-trio==0.8.0

0 commit comments

Comments
 (0)