Skip to content

Commit 59b19e9

Browse files
harsha509harsha509
authored
Merge branch 'trunk' into patch-1
2 parents 95abcd3 + 728f851 commit 59b19e9

Some content is hidden

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

57 files changed

+622
-688
lines changed

‎.github/workflows/dotnet-examples.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@ env:
2121
GH_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
2222

2323
jobs:
24-
test_examples:
24+
tests:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: [ ubuntu-latest, windows-latest, macos-latest ]
28+
os: [ ubuntu, windows, macos ]
2929
release: [ stable, nightly ]
30-
runs-on: ${{ matrix.os }}
30+
runs-on: ${{ format('{0}-latest', matrix.os) }}
3131
steps:
3232
- name: Checkout GitHub repo
3333
uses: actions/checkout@v4
3434
- name: Remove driver directories Windows
35-
if: matrix.os == 'windows-latest'
35+
if: matrix.os == 'windows'
3636
run: |
3737
rm "$env:ChromeWebDriver" -r -v
3838
rm "$env:EdgeWebDriver" -r -v
3939
rm "$env:GeckoWebDriver" -r -v
4040
- name: Remove driver directories Non-Windows
41-
if: matrix.os != 'windows-latest'
41+
if: matrix.os != 'windows'
4242
run: |
4343
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
4444
- name: Start Xvfb
45-
if: matrix.os == 'ubuntu-latest'
45+
if: matrix.os == 'ubuntu'
4646
run: Xvfb :99 &
4747
- name: Set up .Net Stable
4848
if: matrix.release == 'stable'
@@ -58,7 +58,7 @@ jobs:
5858
env:
5959
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
6060
- name: Update Nightly version non-Windows
61-
if: matrix.release == 'nightly' && matrix.os != 'windows-latest'
61+
if: matrix.release == 'nightly' && matrix.os != 'windows'
6262
run:
6363
|
6464
latest_nightly=$(./scripts/latest-nightly-version.sh nuget Selenium.WebDriver)
@@ -67,7 +67,7 @@ jobs:
6767
env:
6868
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6969
- name: Update Nightly version Windows
70-
if: matrix.release == 'nightly' && matrix.os == 'windows-latest'
70+
if: matrix.release == 'nightly' && matrix.os == 'windows'
7171
shell: pwsh
7272
run:
7373
|

‎.github/workflows/java-examples.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@ env:
2121
GH_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
2222

2323
jobs:
24-
test_examples:
24+
tests:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: [ ubuntu-latest, windows-latest, macos-latest ]
28+
os: [ ubuntu, windows, macos ]
2929
release: [ stable, nightly ]
30-
runs-on: ${{ matrix.os }}
30+
runs-on: ${{ format('{0}-latest', matrix.os) }}
3131
steps:
3232
- name: Checkout GitHub repo
3333
uses: actions/checkout@v4
3434
- name: Remove driver directories Windows
35-
if: matrix.os == 'windows-latest'
35+
if: matrix.os == 'windows'
3636
run: |
3737
rm "$env:ChromeWebDriver" -r -v
3838
rm "$env:EdgeWebDriver" -r -v
3939
rm "$env:GeckoWebDriver" -r -v
4040
- name: Remove driver directories Non-Windows
41-
if: matrix.os != 'windows-latest'
41+
if: matrix.os != 'windows'
4242
run: |
4343
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
4444
- name: Start Xvfb
45-
if: matrix.os == 'ubuntu-latest'
45+
if: matrix.os == 'ubuntu'
4646
run: Xvfb :99 &
4747
- name: Set up Java
4848
uses: actions/setup-java@v4
@@ -59,7 +59,7 @@ jobs:
5959
cd examples/java
6060
mvn -B test
6161
- name: Run Tests Nightly Linux/macOS
62-
if: matrix.release == 'nightly' && matrix.os != 'windows-latest'
62+
if: matrix.release == 'nightly' && matrix.os != 'windows'
6363
uses: nick-invision/[email protected]
6464
with:
6565
timeout_minutes: 20
@@ -73,7 +73,7 @@ jobs:
7373
mvn -B -U test -Dselenium.version="$latest_snapshot"
7474
7575
- name: Run Tests Nightly Windows
76-
if: matrix.release == 'nightly' && matrix.os == 'windows-latest'
76+
if: matrix.release == 'nightly' && matrix.os == 'windows'
7777
uses: nick-invision/[email protected]
7878
with:
7979
timeout_minutes: 20

‎.github/workflows/js-examples.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ env:
2121
GH_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
2222

2323
jobs:
24-
test_examples:
24+
tests:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: [ ubuntu-latest, windows-latest, macos-latest ]
28+
os: [ ubuntu, windows, macos ]
2929
release: [ stable, nightly ]
30-
runs-on: ${{ matrix.os }}
30+
runs-on: ${{ format('{0}-latest', matrix.os) }}
3131
steps:
3232
- name: Checkout GitHub repo
3333
uses: actions/checkout@v4
@@ -42,41 +42,41 @@ jobs:
4242
edge-version: stable
4343
id: setup-edge
4444
- name: Install Firefox for set binary test
45-
if: matrix.os != 'windows-latest'
45+
if: matrix.os != 'windows'
4646
uses: browser-actions/setup-firefox@v1
4747
with:
4848
firefox-version: latest
4949
id: setup-firefox
5050
- name: Set ENV Windows
51-
if: matrix.os == 'windows-latest'
51+
if: matrix.os == 'windows'
5252
run: |
5353
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> $env:GITHUB_ENV
5454
echo "EDGE_BIN=C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe" >> $env:GITHUB_ENV
5555
echo "FF_BIN=C:\Program Files (x86)\Mozilla Firefox\firefox-browser.exe" >> $env:GITHUB_ENV
5656
- name: Set ENV Mac
57-
if: matrix.os == 'macos-latest'
57+
if: matrix.os == 'macos'
5858
run: |
5959
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> "$GITHUB_ENV"
6060
echo "EDGE_BIN=/Users/runner/hostedtoolcache/msedge/stable/x64/Contents/MacOS/Microsoft Edge" >> "$GITHUB_ENV"
6161
echo "FF_BIN=/Users/runner/hostedtoolcache/firefox/latest/x64/Contents/MacOS/firefox" >> "$GITHUB_ENV"
6262
- name: Set ENV Linux
63-
if: matrix.os == 'ubuntu-latest'
63+
if: matrix.os == 'ubuntu'
6464
run: |
6565
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> "$GITHUB_ENV"
6666
echo "EDGE_BIN=/opt/hostedtoolcache/msedge/stable/x64/msedge" >> "$GITHUB_ENV"
6767
echo "FF_BIN=/opt/hostedtoolcache/firefox/latest/x64/firefox" >> "$GITHUB_ENV"
6868
- name: Remove driver directories Windows
69-
if: matrix.os == 'windows-latest'
69+
if: matrix.os == 'windows'
7070
run: |
7171
rm "$env:ChromeWebDriver" -r -v
7272
rm "$env:EdgeWebDriver" -r -v
7373
rm "$env:GeckoWebDriver" -r -v
7474
- name: Remove driver directories Non-Windows
75-
if: matrix.os != 'windows-latest'
75+
if: matrix.os != 'windows'
7676
run: |
7777
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
7878
- name: Start Xvfb
79-
if: matrix.os == 'ubuntu-latest'
79+
if: matrix.os == 'ubuntu'
8080
run: Xvfb :99 &
8181
- name: Setup Node Stable
8282
if: matrix.release == 'stable'
@@ -90,7 +90,7 @@ jobs:
9090
node-version: '18.x'
9191
registry-url: 'https://npm.pkg.github.com'
9292
- name: Use Nightly package.json in Ubuntu/macOS
93-
if: matrix.release == 'nightly' && matrix.os != 'windows-latest'
93+
if: matrix.release == 'nightly' && matrix.os != 'windows'
9494
run:
9595
|
9696
latest_nightly=$(./scripts/latest-nightly-version.sh npm selenium-webdriver)
@@ -99,7 +99,7 @@ jobs:
9999
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100100
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
101101
- name: Use Nightly package.json in Windows
102-
if: matrix.release == 'nightly' && matrix.os == 'windows-latest'
102+
if: matrix.release == 'nightly' && matrix.os == 'windows'
103103
run:
104104
|
105105
$latest_nightly = ./scripts/latest-nightly-version.ps1 npm selenium-webdriver

‎.github/workflows/kotlin-examples.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ env:
2121
GH_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
2222

2323
jobs:
24-
test_examples:
24+
tests:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: [ ubuntu-latest, windows-latest, macos-latest ]
29-
runs-on: ${{ matrix.os }}
28+
os: [ ubuntu, windows, macos ]
29+
runs-on: ${{ format('{0}-latest', matrix.os) }}
3030
steps:
3131
- name: Checkout GitHub repo
3232
uses: actions/checkout@v4
@@ -41,41 +41,41 @@ jobs:
4141
edge-version: stable
4242
id: setup-edge
4343
- name: Install Firefox for set binary test
44-
if: matrix.os != 'windows-latest'
44+
if: matrix.os != 'windows'
4545
uses: browser-actions/setup-firefox@v1
4646
with:
4747
firefox-version: latest
4848
id: setup-firefox
4949
- name: Set ENV Windows
50-
if: matrix.os == 'windows-latest'
50+
if: matrix.os == 'windows'
5151
run: |
5252
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> $env:GITHUB_ENV
5353
echo "EDGE_BIN=C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe" >> $env:GITHUB_ENV
5454
echo "FF_BIN=C:\Program Files (x86)\Mozilla Firefox\firefox-browser.exe" >> $env:GITHUB_ENV
5555
- name: Set ENV Mac
56-
if: matrix.os == 'macos-latest'
56+
if: matrix.os == 'macos'
5757
run: |
5858
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> "$GITHUB_ENV"
5959
echo "EDGE_BIN=/Users/runner/hostedtoolcache/msedge/stable/x64/Contents/MacOS/Microsoft Edge" >> "$GITHUB_ENV"
6060
echo "FF_BIN=/Users/runner/hostedtoolcache/firefox/latest/x64/Contents/MacOS/firefox" >> "$GITHUB_ENV"
6161
- name: Set ENV Linux
62-
if: matrix.os == 'ubuntu-latest'
62+
if: matrix.os == 'ubuntu'
6363
run: |
6464
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> "$GITHUB_ENV"
6565
echo "EDGE_BIN=/opt/hostedtoolcache/msedge/stable/x64/msedge" >> "$GITHUB_ENV"
6666
echo "FF_BIN=/opt/hostedtoolcache/firefox/latest/x64/firefox" >> "$GITHUB_ENV"
6767
- name: Remove driver directories Windows
68-
if: matrix.os == 'windows-latest'
68+
if: matrix.os == 'windows'
6969
run: |
7070
rm "$env:ChromeWebDriver" -r -v
7171
rm "$env:EdgeWebDriver" -r -v
7272
rm "$env:GeckoWebDriver" -r -v
7373
- name: Remove driver directories Non-Windows
74-
if: matrix.os != 'windows-latest'
74+
if: matrix.os != 'windows'
7575
run: |
7676
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
7777
- name: Start Xvfb
78-
if: matrix.os == 'ubuntu-latest'
78+
if: matrix.os == 'ubuntu'
7979
run: Xvfb :99 &
8080
- name: Set up Java
8181
uses: actions/setup-java@v4

‎.github/workflows/python-examples.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@ env:
2121
GH_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
2222

2323
jobs:
24-
test_examples:
24+
tests:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: [ ubuntu-latest, windows-latest, macos-latest ]
28+
os: [ ubuntu, windows, macos ]
2929
release: [ stable, nightly ]
30-
runs-on: ${{ matrix.os }}
30+
runs-on: ${{ format('{0}-latest', matrix.os) }}
3131
steps:
3232
- name: Checkout GitHub repo
3333
uses: actions/checkout@v4
3434
- name: Remove driver directories Windows
35-
if: matrix.os == 'windows-latest'
35+
if: matrix.os == 'windows'
3636
run: |
3737
rm "$env:ChromeWebDriver" -r -v
3838
rm "$env:EdgeWebDriver" -r -v
3939
rm "$env:GeckoWebDriver" -r -v
4040
- name: Remove driver directories Non-Windows
41-
if: matrix.os != 'windows-latest'
41+
if: matrix.os != 'windows'
4242
run: |
4343
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
4444
- name: Start Xvfb
45-
if: matrix.os == 'ubuntu-latest'
45+
if: matrix.os == 'ubuntu'
4646
run: Xvfb :99 &
4747
- name: Set up Python
4848
uses: actions/setup-python@v5

‎.github/workflows/ruby-examples.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,36 @@ env:
2121
GH_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
2222

2323
jobs:
24-
test_examples:
24+
tests:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: [ ubuntu-latest, windows-latest, macos-latest ]
28+
os: [ ubuntu, windows, macos ]
2929
release: [ stable, nightly ]
30-
runs-on: ${{ matrix.os }}
30+
runs-on: ${{ format('{0}-latest', matrix.os) }}
3131
steps:
3232
- name: Checkout GitHub repo
3333
uses: actions/checkout@v4
3434
- name: Remove driver directories Windows
35-
if: matrix.os == 'windows-latest'
35+
if: matrix.os == 'windows'
3636
run: |
3737
rm "$env:ChromeWebDriver" -r -v
3838
rm "$env:EdgeWebDriver" -r -v
3939
rm "$env:GeckoWebDriver" -r -v
4040
- name: Remove driver directories Non-Windows
41-
if: matrix.os != 'windows-latest'
41+
if: matrix.os != 'windows'
4242
run: |
4343
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
4444
- name: Start Xvfb
45-
if: matrix.os == 'ubuntu-latest'
45+
if: matrix.os == 'ubuntu'
4646
run: Xvfb :99 &
4747
- name: Set up Ruby
4848
uses: ruby/setup-ruby@v1
4949
with:
5050
ruby-version: 3.0
5151
bundler-cache: true
5252
- name: Install Gems Nightly non-Windows
53-
if: matrix.release == 'nightly' && matrix.os != 'windows-latest'
53+
if: matrix.release == 'nightly' && matrix.os != 'windows'
5454
run:
5555
|
5656
latest_nightly_webdriver=$(./scripts/latest-nightly-version.sh rubygems selenium-webdriver)
@@ -61,7 +61,7 @@ jobs:
6161
env:
6262
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6363
- name: Install Gems Nightly Windows
64-
if: matrix.release == 'nightly' && matrix.os == 'windows-latest'
64+
if: matrix.release == 'nightly' && matrix.os == 'windows'
6565
run:
6666
|
6767
$latest_nightly_webdriver = ./scripts/latest-nightly-version.ps1 rubygems selenium-webdriver

‎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.21.0.jar";
20+
private const string ServerJarName = "selenium-server-4.22.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));

0 commit comments

Comments
 (0)