Skip to content

Commit 3ddaaa5

Browse files
Merge branch 'trunk' into metadata
2 parents fe5d40f + e202389 commit 3ddaaa5

File tree

696 files changed

+11219
-4649
lines changed

Some content is hidden

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

696 files changed

+11219
-4649
lines changed

.github/workflows/bazel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ on:
7070
jobs:
7171
bazel:
7272
name: ${{ inputs.name }}
73-
runs-on: ${{ inputs.os == 'macos' && 'macos-13' || format('{0}-latest', inputs.os) }}
73+
runs-on: ${{ format('{0}-latest', inputs.os) }}
7474
env:
7575
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7676
SEL_M2_USER: ${{ secrets.SEL_M2_USER }}

.github/workflows/ci-python.yml

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
docs:
1717
name: Documentation
1818
needs: build
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout source tree
2222
uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
3636
lint:
3737
name: Lint
3838
needs: build
39-
runs-on: ubuntu-20.04
39+
runs-on: ubuntu-latest
4040
steps:
4141
- name: Checkout source tree
4242
uses: actions/checkout@v4
@@ -58,7 +58,7 @@ jobs:
5858
mypy:
5959
name: Mypy
6060
needs: build
61-
runs-on: ubuntu-20.04
61+
runs-on: ubuntu-latest
6262
steps:
6363
- name: Checkout source tree
6464
uses: actions/checkout@v4
@@ -81,20 +81,32 @@ jobs:
8181
name: Remote Tests
8282
needs: build
8383
uses: ./.github/workflows/bazel.yml
84+
strategy:
85+
fail-fast: false
86+
matrix:
87+
include:
88+
- browser: firefox
8489
with:
85-
name: Integration Tests (remote)
86-
browser: firefox
87-
cache-key: py-remote
90+
name: Integration Tests (remote, ${{ matrix.browser }})
91+
browser: ${{ matrix.browser }}
92+
cache-key: py-remote-${{ matrix.browser }}
8893
run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
8994

90-
safari-tests:
91-
name: Safari Tests
95+
browser-tests:
96+
name: Browser Tests
9297
needs: build
9398
uses: ./.github/workflows/bazel.yml
99+
strategy:
100+
fail-fast: false
101+
matrix:
102+
include:
103+
- browser: safari
104+
os: macos
105+
- browser: chrome
106+
os: macos
94107
with:
95-
name: Integration Tests (safari)
96-
browser: safari
97-
os: macos
98-
cache-key: py-safari
99-
run: |
100-
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-safari-test/selenium/webdriver/safari/launcher_tests.py
108+
name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
109+
browser: ${{ matrix.browser }}
110+
os: ${{ matrix.os }}
111+
cache-key: py-browser-${{ matrix.browser }}
112+
run: bazel test --flaky_test_attempts 3 //py:test-${{ matrix.browser }}

.github/workflows/label-commenter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
jobs:
1313
comment:
1414
if: github.repository_owner == 'seleniumhq'
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v4
1818
- name: Label Commenter

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ maven.install(
180180
"com.google.googlejavaformat:google-java-format:jar:1.24.0",
181181
"com.graphql-java:graphql-java:22.3",
182182
"dev.failsafe:failsafe:3.3.2",
183-
"io.grpc:grpc-context:1.68.0",
183+
"io.grpc:grpc-context:1.68.1",
184184
"io.lettuce:lettuce-core:6.4.0.RELEASE",
185185
"io.netty:netty-buffer:4.1.114.Final",
186186
"io.netty:netty-codec-http:4.1.114.Final",
@@ -199,9 +199,8 @@ maven.install(
199199
"io.opentelemetry:opentelemetry-sdk-testing:1.43.0",
200200
"io.opentelemetry:opentelemetry-sdk-trace:1.43.0",
201201
"io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha",
202-
"io.ous:jtoml:2.0.0",
203202
"it.ozimov:embedded-redis:0.7.3",
204-
"net.bytebuddy:byte-buddy:1.15.7",
203+
"net.bytebuddy:byte-buddy:1.15.10",
205204
"org.htmlunit:htmlunit-core-js:4.5.0",
206205
"org.apache.commons:commons-exec:1.4.0",
207206
"org.apache.logging.log4j:log4j-core:2.24.1",
@@ -221,6 +220,7 @@ maven.install(
221220
"org.redisson:redisson:3.37.0",
222221
"org.slf4j:slf4j-api:2.0.16",
223222
"org.slf4j:slf4j-jdk14:2.0.16",
223+
"org.tomlj:tomlj:1.1.1",
224224
"org.zeromq:jeromq:0.6.0",
225225
],
226226
excluded_artifacts = [

common/src/web/formPage.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@
8080
<option value="oranges">Oranges</option>
8181
</select>
8282

83+
<select id="invisible_multi_select" multiple>
84+
<option selected="selected" value="apples" style="opacity: 0;">Apples</option>
85+
<option value="oranges">Oranges</option>
86+
<option selected="selected" value="lemons">Lemons</option>
87+
</select>
88+
8389
<select name="select-default">
8490
<option>One</option>
8591
<option>Two</option>

dotnet/docs/api/index.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

dotnet/docs/docfx.json

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,40 @@
33
{
44
"src": [
55
{
6+
"src": "../src/webdriver",
67
"files": [
7-
"src/webdriver/WebDriver.csproj",
8-
"src/support/WebDriver.Support.csproj",
9-
"bin/**/*.dll"
10-
],
11-
"src": "../"
8+
"**/*.csproj"
9+
]
1210
}
1311
],
14-
"dest": "api",
15-
"includePrivateMembers": false,
16-
"disableGitFeatures": false,
17-
"disableDefaultFilter": false,
18-
"noRestore": false,
19-
"namespaceLayout": "flattened",
20-
"memberLayout": "samePage",
21-
"allowCompilationErrors": false
12+
"dest": "webdriver",
13+
"namespaceLayout": "nested",
14+
"outputFormat": "apiPage"
15+
},
16+
{
17+
"src": [
18+
{
19+
"src": "../src/support",
20+
"files": [
21+
"**/*.csproj"
22+
]
23+
}
24+
],
25+
"dest": "support",
26+
"namespaceLayout": "nested",
27+
"outputFormat": "apiPage"
2228
}
29+
2330
],
2431
"build": {
2532
"content": [
2633
{
27-
"files": "**/*.{md|yml}",
28-
"src": "api"
34+
"files": [
35+
"**/*.{md,yml}"
36+
],
37+
"exclude": [
38+
"_site/**"
39+
]
2940
}
3041
],
3142
"resource": [
@@ -35,15 +46,16 @@
3546
]
3647
}
3748
],
38-
"dest": "../../build/docs/api/dotnet",
39-
"globalMetadataFiles": [],
40-
"fileMetadataFiles": [],
49+
"output": "../../build/docs/api/dotnet",
4150
"template": [
4251
"default",
4352
"modern"
4453
],
45-
"postProcessors": [],
46-
"keepFileLink": false,
47-
"disableGitFeatures": false
54+
"globalMetadata": {
55+
"_appName": "Selenium .NET API",
56+
"_appLogoPath": "images/logo.svg",
57+
"_appFaviconPath": "images/favicon.ico",
58+
"_enableSearch": true
59+
}
4860
}
4961
}

dotnet/docs/images/favicon.ico

8.96 KB
Binary file not shown.

dotnet/docs/images/logo.svg

Lines changed: 1 addition & 0 deletions
Loading

dotnet/docs/index.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
layout: landingPage
3+
---
4+
5+
# Welcome to the Selenium .NET API Docs
6+
7+
## Modules
8+
- [Selenium.WebDriver](/webdriver/OpenQA.Selenium.html)
9+
- [Selenium.Support](/support/OpenQA.Selenium.Support.html)

0 commit comments

Comments
 (0)