Skip to content

Commit 16379fe

Browse files
authored
Merge branch 'trunk' into edge_py
2 parents e59e183 + 3589d3f commit 16379fe

File tree

5 files changed

+106
-351
lines changed

5 files changed

+106
-351
lines changed

dotnet/src/webdriver/Command.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ private static Dictionary<string, object> ConvertParametersFromJson(string value
151151
[JsonSerializable(typeof(ulong))]
152152
[JsonSerializable(typeof(short))]
153153
[JsonSerializable(typeof(ushort))]
154-
155154
[JsonSerializable(typeof(string))]
156155

157156
// Selenium WebDriver types
@@ -164,7 +163,6 @@ private static Dictionary<string, object> ConvertParametersFromJson(string value
164163

165164
// Selenium Dictionaries, primarily used in Capabilities
166165
[JsonSerializable(typeof(Dictionary<string, object>))]
167-
168166
[JsonSerializable(typeof(Dictionary<string, bool>))]
169167
[JsonSerializable(typeof(Dictionary<string, byte>))]
170168
[JsonSerializable(typeof(Dictionary<string, sbyte>))]
@@ -180,5 +178,6 @@ private static Dictionary<string, object> ConvertParametersFromJson(string value
180178
[JsonSerializable(typeof(Dictionary<string, ulong>))]
181179
[JsonSerializable(typeof(Dictionary<string, short>))]
182180
[JsonSerializable(typeof(Dictionary<string, ushort>))]
181+
[JsonSerializable(typeof(Dictionary<string, string>))]
183182
internal partial class CommandJsonSerializerContext : JsonSerializerContext;
184183
}

java/src/org/openqa/selenium/remote/http/FormEncodedData.java

Lines changed: 0 additions & 95 deletions
This file was deleted.

java/test/org/openqa/selenium/remote/http/FormEncodedDataTest.java

Lines changed: 0 additions & 150 deletions
This file was deleted.

javascript/grid-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
},
4949
"devDependencies": {
5050
"@babel/preset-react": "7.25.9",
51-
"@testing-library/jest-dom": "6.6.2",
51+
"@testing-library/jest-dom": "6.6.3",
5252
"@testing-library/react": "14.3.1",
5353
"@testing-library/user-event": "14.5.2",
5454
"esbuild": "0.24.0",

0 commit comments

Comments
 (0)