Skip to content

Commit 613436f

Browse files
authored
Merge branch 'trunk' into bidi_add_authentication_handler
2 parents c7ab20c + 61a1eb1 commit 613436f

34 files changed

+335
-383
lines changed

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)
File renamed without changes.

dotnet/docs/toc.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
- name: Intro
2+
href: index.md
3+
4+
- name: Modules
5+
items:
6+
- name: WebDriver
7+
href: webdriver/OpenQA.Selenium.yml
8+
- name: Support
9+
href: support/OpenQA.Selenium.Support.yml

dotnet/docs/webdriver/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
###############
2+
# temp file #
3+
###############
4+
*.yml
5+
.manifest

dotnet/src/webdriver/Command.cs

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,27 @@ private static Dictionary<string, object> ConvertParametersFromJson(string value
157157
// Selenium WebDriver types
158158
[JsonSerializable(typeof(char[]))]
159159
[JsonSerializable(typeof(byte[]))]
160-
[JsonSerializable(typeof(Dictionary<string, object>))]
161160
[JsonSerializable(typeof(Cookie))]
162161
[JsonSerializable(typeof(ReturnedCookie))]
163162
[JsonSerializable(typeof(Proxy))]
164-
internal partial class CommandJsonSerializerContext : JsonSerializerContext
165-
{
166163

167-
}
164+
// Selenium Dictionaries, primarily used in Capabilities
165+
[JsonSerializable(typeof(Dictionary<string, object>))]
166+
167+
[JsonSerializable(typeof(Dictionary<string, bool>))]
168+
[JsonSerializable(typeof(Dictionary<string, byte>))]
169+
[JsonSerializable(typeof(Dictionary<string, sbyte>))]
170+
[JsonSerializable(typeof(Dictionary<string, char>))]
171+
[JsonSerializable(typeof(Dictionary<string, decimal>))]
172+
[JsonSerializable(typeof(Dictionary<string, double>))]
173+
[JsonSerializable(typeof(Dictionary<string, float>))]
174+
[JsonSerializable(typeof(Dictionary<string, int>))]
175+
[JsonSerializable(typeof(Dictionary<string, uint>))]
176+
[JsonSerializable(typeof(Dictionary<string, nint>))]
177+
[JsonSerializable(typeof(Dictionary<string, nuint>))]
178+
[JsonSerializable(typeof(Dictionary<string, long>))]
179+
[JsonSerializable(typeof(Dictionary<string, ulong>))]
180+
[JsonSerializable(typeof(Dictionary<string, short>))]
181+
[JsonSerializable(typeof(Dictionary<string, ushort>))]
182+
internal partial class CommandJsonSerializerContext : JsonSerializerContext;
168183
}

java/src/org/openqa/selenium/By.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public static By cssSelector(String cssSelector) {
121121
public WebElement findElement(SearchContext context) {
122122
List<WebElement> allElements = findElements(context);
123123
if (allElements == null || allElements.isEmpty()) {
124-
throw new NoSuchElementException("Cannot locate an element using " + toString());
124+
throw new NoSuchElementException("Cannot locate an element using " + this);
125125
}
126126
return allElements.get(0);
127127
}

0 commit comments

Comments
 (0)