Skip to content

Commit c9fe6d1

Browse files
authored
Merge branch 'trunk' into renovate/selenium-devtools-0.x
2 parents 60af416 + a6d9dbf commit c9fe6d1

File tree

18 files changed

+50
-28
lines changed

18 files changed

+50
-28
lines changed

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

+25-6
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

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

Diff for: examples/java/build.gradle

+1-1
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.30.0'
13+
testImplementation 'org.seleniumhq.selenium:selenium-java:4.31.0'
1414
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.12.1'
1515
}
1616

Diff for: examples/java/pom.xml

+1-1
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>

Diff for: examples/javascript/test/bidirectional/network_events.spec.js

+2-2
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 () {

Diff for: examples/kotlin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
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>

Diff for: examples/ruby/spec/spec_helper.rb

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
# Disable RSpec exposing methods globally on `Module` and `main`
1111
config.disable_monkey_patching!
12+
Dir.mktmpdir('tmp')
13+
config.example_status_persistence_file_path = "tmp/examples.txt"
1214

1315
config.expect_with :rspec do |c|
1416
c.syntax = :expect
@@ -30,6 +32,7 @@
3032
def start_session
3133
options = Selenium::WebDriver::Chrome::Options.new
3234
options.add_argument('disable-search-engine-choice-screen')
35+
options.add_argument('--no-sandbox')
3336
@driver = Selenium::WebDriver.for(:chrome, options: options)
3437
end
3538

Diff for: website_and_docs/content/documentation/_index.en.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ a browser. You can find a more comprehensive example in [Writing your first Sele
4242
{{< gh-codeblock path="/examples/dotnet/HelloSelenium.cs" >}}
4343
{{< /tab >}}
4444
{{< tab header="Ruby" >}}
45-
{{< gh-codeblock path="/examples/ruby/spec/hello/hello_selenium_spec.rb" >}}
45+
{{< gh-codeblock path="/examples/ruby/spec/hello/hello_selenium.rb" >}}
4646
{{< /tab >}}
4747
{{< tab header="JavaScript" >}}
4848
{{< gh-codeblock path="/examples/javascript/test/hello/helloSelenium.js" >}}

Diff for: website_and_docs/content/documentation/_index.ja.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Seleniumの中核は[WebDriver]({{< ref "webdriver.md" >}})であり、様々な
2929
{{< gh-codeblock path="/examples/dotnet/HelloSelenium.cs" >}}
3030
{{< /tab >}}
3131
{{< tab header="Ruby" >}}
32-
{{< gh-codeblock path="/examples/ruby/spec/hello/hello_selenium_spec.rb" >}}
32+
{{< gh-codeblock path="/examples/ruby/spec/hello/hello_selenium.rb" >}}
3333
{{< /tab >}}
3434
{{< tab header="JavaScript" >}}
3535
{{< gh-codeblock path="/examples/javascript/test/hello/helloSelenium.js" >}}

Diff for: website_and_docs/content/documentation/_index.pt-br.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ navegadores. Aqui está uma das instruções mais simples que você pode fazer:
4040
{{< gh-codeblock path="/examples/dotnet/HelloSelenium.cs" >}}
4141
{{< /tab >}}
4242
{{< tab header="Ruby" >}}
43-
{{< gh-codeblock path="/examples/ruby/spec/hello/hello_selenium_spec.rb" >}}
43+
{{< gh-codeblock path="/examples/ruby/spec/hello/hello_selenium.rb" >}}
4444
{{< /tab >}}
4545
{{< tab header="JavaScript" >}}
4646
{{< gh-codeblock path="/examples/javascript/test/hello/helloSelenium.js" >}}

Diff for: website_and_docs/content/documentation/_index.zh-cn.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Selenium 的核心是 [WebDriver]({{< ref "webdriver.md" >}}),这是一个编
3434
{{< gh-codeblock path="/examples/dotnet/HelloSelenium.cs" >}}
3535
{{< /tab >}}
3636
{{< tab header="Ruby" >}}
37-
{{< gh-codeblock path="/examples/ruby/spec/hello/hello_selenium_spec.rb" >}}
37+
{{< gh-codeblock path="/examples/ruby/spec/hello/hello_selenium.rb" >}}
3838
{{< /tab >}}
3939
{{< tab header="JavaScript" >}}
4040
{{< gh-codeblock path="/examples/javascript/test/hello/helloSelenium.js" >}}

Diff for: website_and_docs/content/documentation/webdriver/getting_started/using_selenium.en.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ In your project's `package.json`, add requirement to `dependencies`:
198198

199199
### Tear Down
200200

201-
{{< gh-codeblock path="examples/ruby/spec/spec_helper.rb#L28" >}}
201+
{{< gh-codeblock path="examples/ruby/spec/spec_helper.rb#L30" >}}
202202
{{% /tab %}}
203203
{{< tab header="JavaScript" >}}
204204

Diff for: website_and_docs/content/documentation/webdriver/getting_started/using_selenium.ja.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Seleniumコードの使用方法に関係なく、優れた統合開発環境が
188188

189189
### 取り壊す
190190

191-
{{< gh-codeblock path="examples/ruby/spec/spec_helper.rb#L28" >}}
191+
{{< gh-codeblock path="examples/ruby/spec/spec_helper.rb#L30" >}}
192192
{{% /tab %}}
193193
{{< tab header="JavaScript" >}}
194194

Diff for: website_and_docs/content/documentation/webdriver/getting_started/using_selenium.pt-br.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ In your project's `package.json`, adicionar requisito às `dependências`:
192192

193193
### Tear Down
194194

195-
{{< gh-codeblock path="examples/ruby/spec/spec_helper.rb#L28" >}}
195+
{{< gh-codeblock path="examples/ruby/spec/spec_helper.rb#L30" >}}
196196
{{% /tab %}}
197197
{{< tab header="JavaScript" >}}
198198

Diff for: website_and_docs/content/documentation/webdriver/getting_started/using_selenium.zh-cn.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ In your project's `package.json`, add requirement to `dependencies`:
176176

177177
### Tear Down
178178

179-
{{< gh-codeblock path="examples/ruby/spec/spec_helper.rb#L28" >}}
179+
{{< gh-codeblock path="examples/ruby/spec/spec_helper.rb#L30" >}}
180180
{{% /tab %}}
181181
{{< tab header="JavaScript" >}}
182182

Diff for: website_and_docs/content/sponsor/_index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ <h2 class="alert-heading pb-3">General Benefits</h2>
5252
</li>
5353
<li>
5454
Our website is the first place people learn about Selenium. By having a link to your
55-
website, you will be seen as a supporter of the Selenium project that our users adore. </li>
55+
website, you will be seen as a supporter of the Selenium project that our users adore.
56+
</li>
5657
<li>
5758
Contributions are tax-deductible.
5859
</li>
@@ -64,7 +65,6 @@ <h2 class="alert-heading pb-3">General Benefits</h2>
6465
Check the <a href="#support-levels">Sponsorship Levels</a> for more benefits.
6566
</li>
6667
</ul>
67-
</p>
6868
</div>
6969
</div>
7070
</div>
@@ -115,7 +115,7 @@ <h2 class="alert-heading pb-3" id="support-levels">Sponsorship Levels</h2>
115115
needs to be actively contributing to the project.
116116
</li>
117117
<li>
118-
Currently limited to 2 companies but reviewed yearly.
118+
Currently limited to 3 companies but reviewed yearly.
119119
</li>
120120
<li>Special mention at Selenium events</li>
121121
<li>

Diff for: website_and_docs/data/sponsors.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ development:
99
- logo: "/images/sponsors/saucelabs.png"
1010
url: "https://saucelabs.com/resources/topic-hub/selenium?utm_source=selenium&utm_medium=website&utm_campaign=selenium-sponsorship-fy25"
1111
name: "Sauce Labs"
12+
# Sponsorship renewed October 16, 2024. Renewed again on April 8, 2025, under the "Development" level
13+
- logo: "/images/sponsors/lambda-test.png"
14+
url: "https://www.lambdatest.com/selenium-automation?utm_source=selenium&utm_medium=open-source-sponsor&utm_campaign=nov_14&utm_term=sk&utm_content=web"
15+
name: "LambdaTest"
1216

1317
selenium:
1418
# Set to false if no items are present
@@ -22,10 +26,6 @@ selenium:
2226
- logo: "/images/sponsors/applitools.png"
2327
url: "https://applitools.com/"
2428
name: "Applitools"
25-
# Sponsorship renewed October 16, 2024.
26-
- logo: "/images/sponsors/lambda-test.png"
27-
url: "https://www.lambdatest.com/selenium-automation?utm_source=selenium&utm_medium=open-source-sponsor&utm_campaign=nov_14&utm_term=sk&utm_content=web"
28-
name: "LambdaTest"
2929
# Sponsorship start date: June 24, 2015, updated July 2023 (only logo, not the agreement)
3030
# - logo: "/images/sponsors/Digital.ai.jpg"
3131
# url: "http://bit.ly/36uZ7ad"

0 commit comments

Comments
 (0)