Skip to content

Commit

Permalink
Merge branch 'trunk' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
@harsha509
harsha509 authored Jul 9, 2024
2 parents 95abcd3 + 728f851 commit 59b19e9
Show file tree
Hide file tree
Showing 57 changed files with 622 additions and 688 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/dotnet-examples.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,28 @@ env:
GH_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}

jobs:
test_examples:
tests:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
os: [ ubuntu, windows, macos ]
release: [ stable, nightly ]
runs-on: ${{ matrix.os }}
runs-on: ${{ format('{0}-latest', matrix.os) }}
steps:
- name: Checkout GitHub repo
uses: actions/checkout@v4
- name: Remove driver directories Windows
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows'
run: |
rm "$env:ChromeWebDriver" -r -v
rm "$env:EdgeWebDriver" -r -v
rm "$env:GeckoWebDriver" -r -v
- name: Remove driver directories Non-Windows
if: matrix.os != 'windows-latest'
if: matrix.os != 'windows'
run: |
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
- name: Start Xvfb
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu'
run: Xvfb :99 &
- name: Set up .Net Stable
if: matrix.release == 'stable'
Expand All @@ -58,7 +58,7 @@ jobs:
env:
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: Update Nightly version non-Windows
if: matrix.release == 'nightly' && matrix.os != 'windows-latest'
if: matrix.release == 'nightly' && matrix.os != 'windows'
run:
|
latest_nightly=$(./scripts/latest-nightly-version.sh nuget Selenium.WebDriver)
Expand All @@ -67,7 +67,7 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Update Nightly version Windows
if: matrix.release == 'nightly' && matrix.os == 'windows-latest'
if: matrix.release == 'nightly' && matrix.os == 'windows'
shell: pwsh
run:
|
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/java-examples.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,28 @@ env:
GH_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}

jobs:
test_examples:
tests:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
os: [ ubuntu, windows, macos ]
release: [ stable, nightly ]
runs-on: ${{ matrix.os }}
runs-on: ${{ format('{0}-latest', matrix.os) }}
steps:
- name: Checkout GitHub repo
uses: actions/checkout@v4
- name: Remove driver directories Windows
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows'
run: |
rm "$env:ChromeWebDriver" -r -v
rm "$env:EdgeWebDriver" -r -v
rm "$env:GeckoWebDriver" -r -v
- name: Remove driver directories Non-Windows
if: matrix.os != 'windows-latest'
if: matrix.os != 'windows'
run: |
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
- name: Start Xvfb
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu'
run: Xvfb :99 &
- name: Set up Java
uses: actions/setup-java@v4
Expand All @@ -59,7 +59,7 @@ jobs:
cd examples/java
mvn -B test
- name: Run Tests Nightly Linux/macOS
if: matrix.release == 'nightly' && matrix.os != 'windows-latest'
if: matrix.release == 'nightly' && matrix.os != 'windows'
uses: nick-invision/retry@v3.0.0
with:
timeout_minutes: 20
Expand All @@ -73,7 +73,7 @@ jobs:
mvn -B -U test -Dselenium.version="$latest_snapshot"
- name: Run Tests Nightly Windows
if: matrix.release == 'nightly' && matrix.os == 'windows-latest'
if: matrix.release == 'nightly' && matrix.os == 'windows'
uses: nick-invision/retry@v3.0.0
with:
timeout_minutes: 20
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/js-examples.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ env:
GH_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}

jobs:
test_examples:
tests:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
os: [ ubuntu, windows, macos ]
release: [ stable, nightly ]
runs-on: ${{ matrix.os }}
runs-on: ${{ format('{0}-latest', matrix.os) }}
steps:
- name: Checkout GitHub repo
uses: actions/checkout@v4
Expand All @@ -42,41 +42,41 @@ jobs:
edge-version: stable
id: setup-edge
- name: Install Firefox for set binary test
if: matrix.os != 'windows-latest'
if: matrix.os != 'windows'
uses: browser-actions/setup-firefox@v1
with:
firefox-version: latest
id: setup-firefox
- name: Set ENV Windows
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows'
run: |
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> $env:GITHUB_ENV
echo "EDGE_BIN=C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe" >> $env:GITHUB_ENV
echo "FF_BIN=C:\Program Files (x86)\Mozilla Firefox\firefox-browser.exe" >> $env:GITHUB_ENV
- name: Set ENV Mac
if: matrix.os == 'macos-latest'
if: matrix.os == 'macos'
run: |
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> "$GITHUB_ENV"
echo "EDGE_BIN=/Users/runner/hostedtoolcache/msedge/stable/x64/Contents/MacOS/Microsoft Edge" >> "$GITHUB_ENV"
echo "FF_BIN=/Users/runner/hostedtoolcache/firefox/latest/x64/Contents/MacOS/firefox" >> "$GITHUB_ENV"
- name: Set ENV Linux
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu'
run: |
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> "$GITHUB_ENV"
echo "EDGE_BIN=/opt/hostedtoolcache/msedge/stable/x64/msedge" >> "$GITHUB_ENV"
echo "FF_BIN=/opt/hostedtoolcache/firefox/latest/x64/firefox" >> "$GITHUB_ENV"
- name: Remove driver directories Windows
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows'
run: |
rm "$env:ChromeWebDriver" -r -v
rm "$env:EdgeWebDriver" -r -v
rm "$env:GeckoWebDriver" -r -v
- name: Remove driver directories Non-Windows
if: matrix.os != 'windows-latest'
if: matrix.os != 'windows'
run: |
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
- name: Start Xvfb
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu'
run: Xvfb :99 &
- name: Setup Node Stable
if: matrix.release == 'stable'
Expand All @@ -90,7 +90,7 @@ jobs:
node-version: '18.x'
registry-url: 'https://npm.pkg.github.com'
- name: Use Nightly package.json in Ubuntu/macOS
if: matrix.release == 'nightly' && matrix.os != 'windows-latest'
if: matrix.release == 'nightly' && matrix.os != 'windows'
run:
|
latest_nightly=$(./scripts/latest-nightly-version.sh npm selenium-webdriver)
Expand All @@ -99,7 +99,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Use Nightly package.json in Windows
if: matrix.release == 'nightly' && matrix.os == 'windows-latest'
if: matrix.release == 'nightly' && matrix.os == 'windows'
run:
|
$latest_nightly = ./scripts/latest-nightly-version.ps1 npm selenium-webdriver
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/kotlin-examples.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ env:
GH_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}

jobs:
test_examples:
tests:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
runs-on: ${{ matrix.os }}
os: [ ubuntu, windows, macos ]
runs-on: ${{ format('{0}-latest', matrix.os) }}
steps:
- name: Checkout GitHub repo
uses: actions/checkout@v4
Expand All @@ -41,41 +41,41 @@ jobs:
edge-version: stable
id: setup-edge
- name: Install Firefox for set binary test
if: matrix.os != 'windows-latest'
if: matrix.os != 'windows'
uses: browser-actions/setup-firefox@v1
with:
firefox-version: latest
id: setup-firefox
- name: Set ENV Windows
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows'
run: |
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> $env:GITHUB_ENV
echo "EDGE_BIN=C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe" >> $env:GITHUB_ENV
echo "FF_BIN=C:\Program Files (x86)\Mozilla Firefox\firefox-browser.exe" >> $env:GITHUB_ENV
- name: Set ENV Mac
if: matrix.os == 'macos-latest'
if: matrix.os == 'macos'
run: |
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> "$GITHUB_ENV"
echo "EDGE_BIN=/Users/runner/hostedtoolcache/msedge/stable/x64/Contents/MacOS/Microsoft Edge" >> "$GITHUB_ENV"
echo "FF_BIN=/Users/runner/hostedtoolcache/firefox/latest/x64/Contents/MacOS/firefox" >> "$GITHUB_ENV"
- name: Set ENV Linux
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu'
run: |
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> "$GITHUB_ENV"
echo "EDGE_BIN=/opt/hostedtoolcache/msedge/stable/x64/msedge" >> "$GITHUB_ENV"
echo "FF_BIN=/opt/hostedtoolcache/firefox/latest/x64/firefox" >> "$GITHUB_ENV"
- name: Remove driver directories Windows
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows'
run: |
rm "$env:ChromeWebDriver" -r -v
rm "$env:EdgeWebDriver" -r -v
rm "$env:GeckoWebDriver" -r -v
- name: Remove driver directories Non-Windows
if: matrix.os != 'windows-latest'
if: matrix.os != 'windows'
run: |
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
- name: Start Xvfb
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu'
run: Xvfb :99 &
- name: Set up Java
uses: actions/setup-java@v4
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/python-examples.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,28 @@ env:
GH_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}

jobs:
test_examples:
tests:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
os: [ ubuntu, windows, macos ]
release: [ stable, nightly ]
runs-on: ${{ matrix.os }}
runs-on: ${{ format('{0}-latest', matrix.os) }}
steps:
- name: Checkout GitHub repo
uses: actions/checkout@v4
- name: Remove driver directories Windows
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows'
run: |
rm "$env:ChromeWebDriver" -r -v
rm "$env:EdgeWebDriver" -r -v
rm "$env:GeckoWebDriver" -r -v
- name: Remove driver directories Non-Windows
if: matrix.os != 'windows-latest'
if: matrix.os != 'windows'
run: |
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
- name: Start Xvfb
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu'
run: Xvfb :99 &
- name: Set up Python
uses: actions/setup-python@v5
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ruby-examples.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,36 +21,36 @@ env:
GH_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}

jobs:
test_examples:
tests:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
os: [ ubuntu, windows, macos ]
release: [ stable, nightly ]
runs-on: ${{ matrix.os }}
runs-on: ${{ format('{0}-latest', matrix.os) }}
steps:
- name: Checkout GitHub repo
uses: actions/checkout@v4
- name: Remove driver directories Windows
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows'
run: |
rm "$env:ChromeWebDriver" -r -v
rm "$env:EdgeWebDriver" -r -v
rm "$env:GeckoWebDriver" -r -v
- name: Remove driver directories Non-Windows
if: matrix.os != 'windows-latest'
if: matrix.os != 'windows'
run: |
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
- name: Start Xvfb
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu'
run: Xvfb :99 &
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0
bundler-cache: true
- name: Install Gems Nightly non-Windows
if: matrix.release == 'nightly' && matrix.os != 'windows-latest'
if: matrix.release == 'nightly' && matrix.os != 'windows'
run:
|
latest_nightly_webdriver=$(./scripts/latest-nightly-version.sh rubygems selenium-webdriver)
Expand All @@ -61,7 +61,7 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Install Gems Nightly Windows
if: matrix.release == 'nightly' && matrix.os == 'windows-latest'
if: matrix.release == 'nightly' && matrix.os == 'windows'
run:
|
$latest_nightly_webdriver = ./scripts/latest-nightly-version.ps1 rubygems selenium-webdriver
Expand Down
2 changes: 1 addition & 1 deletion examples/dotnet/SeleniumDocs/BaseTest.cs
View file
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.21.0.jar";
private const string ServerJarName = "selenium-server-4.22.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
Loading

0 comments on commit 59b19e9

Please sign in to comment.