Skip to content

Commit f8d2678

Browse files
authored
Merge branch 'trunk' into renovate/pnpm-9.x
2 parents 742d684 + bd225cc commit f8d2678

File tree

96 files changed

+1441
-975
lines changed

Some content is hidden

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

96 files changed

+1441
-975
lines changed

.github/workflows/ci-python.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
steps:
2121
- name: Checkout source tree
2222
uses: actions/checkout@v4
23-
- name: Set up Python 3.8
23+
- name: Set up Python 3.9
2424
uses: actions/setup-python@v4
2525
with:
26-
python-version: 3.8
26+
python-version: 3.9
2727
- name: Install dependencies
2828
run: |
2929
python -m pip install --upgrade pip
@@ -40,10 +40,10 @@ jobs:
4040
steps:
4141
- name: Checkout source tree
4242
uses: actions/checkout@v4
43-
- name: Set up Python 3.8
43+
- name: Set up Python 3.9
4444
uses: actions/setup-python@v4
4545
with:
46-
python-version: 3.8
46+
python-version: 3.9
4747
- name: Install dependencies
4848
run: |
4949
python -m pip install --upgrade pip
@@ -62,10 +62,10 @@ jobs:
6262
steps:
6363
- name: Checkout source tree
6464
uses: actions/checkout@v4
65-
- name: Set up Python 3.8
65+
- name: Set up Python 3.9
6666
uses: actions/setup-python@v4
6767
with:
68-
python-version: 3.8
68+
python-version: 3.9
6969
- name: Install dependencies
7070
run: |
7171
python -m pip install --upgrade pip

.github/workflows/ci-rbe.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
name: Check format script run
1717
caching: false
18-
ruby-version: jruby-9.4.8.0
18+
ruby-version: jruby-9.4.9.0
1919
run: ./scripts/github-actions/check-format.sh
2020

2121
test:
@@ -25,5 +25,5 @@ jobs:
2525
with:
2626
name: All RBE tests
2727
caching: false
28-
ruby-version: jruby-9.4.8.0
28+
ruby-version: jruby-9.4.9.0
2929
run: ./scripts/github-actions/ci-build.sh

.github/workflows/ci-renovate-rbe.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
with:
4848
name: Check format script run
4949
caching: false
50-
ruby-version: jruby-9.4.8.0
50+
ruby-version: jruby-9.4.9.0
5151
run: ./scripts/github-actions/check-format.sh
5252

5353
test:
@@ -58,7 +58,7 @@ jobs:
5858
with:
5959
name: All RBE tests
6060
caching: false
61-
ruby-version: jruby-9.4.8.0
61+
ruby-version: jruby-9.4.9.0
6262
run: ./scripts/github-actions/ci-build.sh
6363

6464
ci-gh:

.github/workflows/ci-ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
os: macos
4848
- ruby-version: 3.3.5
4949
os: ubuntu
50-
- ruby-version: jruby-9.4.8.0
50+
- ruby-version: jruby-9.4.9.0
5151
os: ubuntu
5252
- ruby-version: truffleruby-24.1.1
5353
os: ubuntu

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172
with:
173173
name: Nightly JavaScript Release
174174
cache-key: javascript-nightly
175-
node-version: '18.x'
175+
node-version: '22.x'
176176
run: |
177177
sed -i 's|https://registry.npmjs.org/|https://npm.pkg.github.com|g' javascript/node/selenium-webdriver/package.json
178178
sed -i 's|"name": "selenium-webdriver"|"name": "@seleniumhq/selenium-webdriver"|g' javascript/node/selenium-webdriver/package.json

.github/workflows/update-documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ jobs:
107107
run: |
108108
git config --local user.email "[email protected]"
109109
git config --local user.name "Selenium CI Bot"
110-
- name: Set up Python 3.8
110+
- name: Set up Python 3.9
111111
uses: actions/setup-python@v5
112112
with:
113-
python-version: 3.8
113+
python-version: 3.9
114114
- name: Install dependencies
115115
run: |
116116
python -m pip install --upgrade pip

MODULE.bazel

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ use_repo(oci, "chrome_standalone", "firefox_standalone", "java_image_base")
111111
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
112112
python.toolchain(
113113
is_default = True,
114-
python_version = "3.8",
114+
python_version = "3.9",
115115
)
116-
python.toolchain(python_version = "3.9")
117116
python.toolchain(python_version = "3.10")
118117
python.toolchain(python_version = "3.11")
118+
python.toolchain(python_version = "3.12")
119119
use_repo(python, "pythons_hub")
120120

121121
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
@@ -127,10 +127,10 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
127127
requirements_lock = "//py:requirements_lock.txt",
128128
)
129129
for version in [
130-
"3.8",
131130
"3.9",
132131
"3.10",
133132
"3.11",
133+
"3.12",
134134
]
135135
]
136136

@@ -201,10 +201,10 @@ maven.install(
201201
"io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha",
202202
"it.ozimov:embedded-redis:0.7.3",
203203
"net.bytebuddy:byte-buddy:1.15.11",
204-
"org.htmlunit:htmlunit-core-js:4.6.0",
204+
"org.htmlunit:htmlunit-core-js:4.7.0",
205205
"org.apache.commons:commons-exec:1.4.0",
206206
"org.apache.logging.log4j:log4j-core:2.24.3",
207-
"org.assertj:assertj-core:3.27.1",
207+
"org.assertj:assertj-core:3.27.2",
208208
"org.bouncycastle:bcpkix-jdk18on:1.79",
209209
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
210210
"org.hsqldb:hsqldb:2.7.4",
@@ -216,7 +216,7 @@ maven.install(
216216
"org.junit.platform:junit-platform-reporting",
217217
"org.junit.platform:junit-platform-commons",
218218
"org.junit.platform:junit-platform-engine",
219-
"org.mockito:mockito-core:5.14.2",
219+
"org.mockito:mockito-core:5.15.2",
220220
"org.redisson:redisson:3.41.0",
221221
"org.slf4j:slf4j-api:2.0.16",
222222
"org.slf4j:slf4j-jdk14:2.0.16",
@@ -263,10 +263,11 @@ ruby.bundle_fetch(
263263
"//:rb/selenium-webdriver.gemspec",
264264
],
265265
gem_checksums = {
266-
"activesupport-7.2.1.2": "6c3f6ad50c4e52ce39d67aeda38f99e1372eca8b295987d072c19460ebce4cb1",
266+
"activesupport-7.2.2.1": "842bcbf8a92977f80fb4750661a237cf5dd4fdd442066b3c35e88afb488647f5",
267267
"addressable-2.8.7": "462986537cf3735ab5f3c0f557f14155d778f4b43ea4f485a9deb9c8f7c58232",
268268
"ast-2.4.2": "1e280232e6a33754cde542bc5ef85520b74db2aac73ec14acef453784447cc12",
269269
"base64-0.2.0": "0f25e9b21a02a0cc0cea8ef92b2041035d39350946e8789c562b2d1a3da01507",
270+
"benchmark-0.4.0": "0f12f8c495545e3710c3e4f0480f63f06b4c842cc94cec7f33a956f5180e874a",
270271
"bigdecimal-3.1.8": "a89467ed5a44f8ae01824af49cbc575871fa078332e8f77ea425725c1ffe27be",
271272
"bigdecimal-3.1.8-java": "b9e94c14623fff8575f17a10320852219bbba92ecff4977571503d942687326e",
272273
"concurrent-ruby-1.3.4": "d4aa926339b0a86b5b5054a0a8c580163e6f5dcbdfd0f4bb916b1a2570731c32",
@@ -280,24 +281,24 @@ ruby.bundle_fetch(
280281
"ffi-1.17.0": "51630e43425078311c056ca75f961bb3bda1641ab36e44ad4c455e0b0e4a231c",
281282
"ffi-1.17.0-java": "f65f022616970fcde83fe176393eb873a7b959ef2703f94931cf0af6ab55ec7a",
282283
"ffi-1.17.0-x86_64-darwin": "fdcd48c69db3303ef95aec5c64d6275fcf9878a02c0bec0afddc506ceca0f56b",
283-
"fileutils-1.7.2": "36a0fb324218263e52b486ad7408e9a295378fe8edc9fd343709e523c0980631",
284+
"fileutils-1.7.3": "57271e854b694a87755d76f836f5c57b2c9538ebbaf4b2154bb66addf15eb5da",
284285
"git-1.19.1": "b0a422d9f6517353c48a330d6114de4db9e0c82dbe7202964a1d9f1fbc827d70",
285-
"hashdiff-1.1.1": "c7966316726e0ceefe9f5c6aef107ebc3ccfef8b6db55fe3934f046b2cf0936a",
286+
"hashdiff-1.1.2": "2c30eeded6ed3dce8401d2b5b99e6963fe5f14ed85e60dd9e33c545a44b71a77",
286287
"i18n-1.14.6": "dc229a74f5d181f09942dd60ab5d6e667f7392c4ee826f35096db36d1fe3614c",
287288
"io-console-0.7.2": "f0dccff252f877a4f60d04a4dc6b442b185ebffb4b320ab69212a92b48a7a221",
288289
"io-console-0.7.2-java": "73aa382f8832b116613ceaf57b8ff5bf73dfedcaf39f0aa5420e10f63a4543ed",
289290
"irb-1.14.1": "5975003b58d36efaf492380baa982ceedf5aed36967a4d5b40996bc5c66e80f8",
290291
"jar-dependencies-0.4.1": "b2df2f1ecbff15334ce20ea7fdd5b8d8161faab67761ff72c7647d728e40d387",
291-
"json-2.7.4": "9ea6258b4add3abd25df965515be8b19be417f58b8c42619c7f2d3e86c158ece",
292-
"json-2.7.4-java": "5d5d1593d8727a66f2e4161710dde06ba7043c9b3fa9eea0889fdc0450a107cd",
292+
"json-2.8.2": "dd4fa6c9c81daecf72b86ea36e56ed8955fdbb4d4dc379c93d313a59344486cf",
293+
"json-2.8.2-java": "7a7321efd8fad215a1afe92b5f16546203f193781da2d5c01587600cc00aa302",
293294
"language_server-protocol-3.17.0.3": "3d5c58c02f44a20d972957a9febe386d7e7468ab3900ce6bd2b563dd910c6b3f",
294295
"listen-3.9.0": "db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67",
295296
"logger-1.6.1": "3ad9587ed3940bf7897ea64a673971415523f4f7d6b22c5e3af5219705669653",
296-
"minitest-5.25.1": "3db6795a80634def1cf86fda79d2d83b59b25ce5e186fa675f73c565589d2ad8",
297+
"minitest-5.25.2": "59b379d63e0058159127b545c4725d3106624c9be2b3e030ddaee825d59e83eb",
297298
"parallel-1.26.3": "d86babb7a2b814be9f4b81587bf0b6ce2da7d45969fab24d8ae4bf2bb4d4c7ef",
298-
"parser-3.3.5.0": "f30ebb71b7830c2e7cdc4b2b0e0ec2234900e3fca3fe2fba47f78be759181ab3",
299-
"psych-5.1.2": "337322f58fc2bf24827d2b9bd5ab595f6a72971867d151bb39980060ea40a368",
300-
"psych-5.1.2-java": "1dd68dc609eddbc884e6892e11da942e16f7256bd30ebde9d35449d43043a6fe",
299+
"parser-3.3.6.0": "25d4e67cc4f0f7cab9a2ae1f38e2005b6904d2ea13c34734511d0faad038bc3b",
300+
"psych-5.2.0": "6603fe756bcaf14daa25bc17625f36c90931dcf70452ac1e8da19760dc310573",
301+
"psych-5.2.0-java": "da3a7995e652365faa210d7658a291141c9a15bf05a4d9a48a13856b04f36960",
301302
"public_suffix-6.0.1": "61d44e1cab5cbbbe5b31068481cf16976dd0dc1b6b07bd95617ef8c5e3e00c6f",
302303
"racc-1.8.1": "4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f",
303304
"racc-1.8.1-java": "54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98",
@@ -308,35 +309,35 @@ ruby.bundle_fetch(
308309
"rb-inotify-0.11.1": "a0a700441239b0ff18eb65e3866236cd78613d6b9f78fea1f9ac47a85e47be6e",
309310
"rbs-3.6.1": "ed7273d018556844583d1785ac54194e67eec594d68e317d57fa90ad035532c0",
310311
"rchardet-1.8.0": "693acd5253d5ade81a51940697955f6dd4bb2f0d245bda76a8e23deec70a52c7",
311-
"rdoc-6.7.0": "b17d5f0f57b0853d7b880d4360a32c7caf8dbb81f8503a36426df809e617f379",
312+
"rdoc-6.8.1": "0128002d1bfc4892bdd780940841e4ca41275f63781fd832d11bc8ba4461462c",
312313
"regexp_parser-2.9.2": "5a27e767ad634f8a4b544520d5cd28a0db7aa1198a5d7c9d7e11d7b3d9066446",
313-
"reline-0.5.10": "1660c969a792ebd034e6ceee8ca628f3b6698dcdb34f7a282a5edda37b958166",
314+
"reline-0.5.11": "868d5f4dbfd9caafa70182f7f6fa258b70baee4e565d7cd9e70b4d5b11a7cb65",
314315
"rexml-3.3.9": "d71875b85299f341edf47d44df0212e7658cbdf35aeb69cefdb63f57af3137c9",
315316
"rspec-3.13.0": "d490914ac1d5a5a64a0e1400c1d54ddd2a501324d703b8cfe83f458337bab993",
316317
"rspec-core-3.13.2": "94fbda6e4738e478f1c7532b7cc241272fcdc8b9eac03a97338b1122e4573300",
317318
"rspec-expectations-3.13.3": "0e6b5af59b900147698ea0ff80456c4f2e69cac4394fbd392fbd1ca561f66c58",
318319
"rspec-mocks-3.13.2": "2327335def0e1665325a9b617e3af9ae20272741d80ac550336309a7c59abdef",
319320
"rspec-support-3.13.1": "48877d4f15b772b7538f3693c22225f2eda490ba65a0515c4e7cf6f2f17de70f",
320-
"rubocop-1.67.0": "8ccca7226e76d0a9974af960ea446d1fb38adf0c491214294e2fed75a85c378c",
321-
"rubocop-ast-1.32.3": "40201e861c73a3c2d59428c7627828ef81fb2f8a306bc4a1c1801452afe3fe0f",
321+
"rubocop-1.68.0": "07df508504d81e97174e8d21030f25d52c1be7ee8615939db43f3b377ea6c12b",
322+
"rubocop-ast-1.36.1": "15d89a8953178bc32561d481a3620496e70933a228be1e3b6997b01b8d587b79",
322323
"rubocop-capybara-2.21.0": "5d264efdd8b6c7081a3d4889decf1451a1cfaaec204d81534e236bc825b280ab",
323324
"rubocop-factory_bot-2.26.1": "8de13cd4edcee5ca800f255188167ecef8dbfc3d1fae9f15734e9d2e755392aa",
324-
"rubocop-performance-1.22.1": "9ed9737af1ee90655654b483e0eac4e64702139e85d33335bf744b57a309a679",
325+
"rubocop-performance-1.23.0": "34ae78cb1bc5f1a0b34a34a1f9f6eec2cb8b8b9cafa2ce37982021e86fa49171",
325326
"rubocop-rake-0.6.0": "56b6f22189af4b33d4f4e490a555c09f1281b02f4d48c3a61f6e8fe5f401d8db",
326327
"rubocop-rspec-2.31.0": "2bae19388d78e1ceace44cd95fd34f3209f4ef20cac1b168d0a1325cbba3d672",
327328
"rubocop-rspec_rails-2.29.1": "4ae95abbe9ca5a9b6d8be14e50d230fb5b6ba033b05d4c0981b5b76fc44988e4",
328329
"ruby-progressbar-1.13.0": "80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33",
329330
"rubyzip-2.3.2": "3f57e3935dc2255c414484fbf8d673b4909d8a6a57007ed754dde39342d2373f",
330-
"securerandom-0.3.1": "98f0450c0ea46d2f9a4b6db4f391dbd83dc08049592eada155739f40e0341bde",
331+
"securerandom-0.3.2": "e8b2ffa651dfbbb26eb4bfb8ddcfff94221a93e3f118f39e0f7f94c14fea9dc0",
331332
"steep-1.5.3": "7c6302a4d5932d0a46176ebc79766e52b853c223a85525aa2f8911e345123b85",
332-
"stringio-3.1.1": "53456e14175c594e0e8eb2206a1be33f3974d4fe21c131e628908b05c8c2ae1e",
333+
"stringio-3.1.2": "204f1828f85cdb39d57cac4abc6dc44b04505a223f131587f2e20ae3729ba131",
333334
"strscan-3.1.0": "01b8a81d214fbf7b5308c6fb51b5972bbfc4a6aa1f166fd3618ba97e0fcd5555",
334335
"strscan-3.1.0-java": "8645aa76e017e21764c6df572d2d79fcc1672284014f5bdbd806278cdbcd11b0",
335336
"terminal-table-3.0.2": "f951b6af5f3e00203fb290a669e0a85c5dd5b051b3b023392ccfd67ba5abae91",
336337
"tzinfo-2.0.6": "8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b",
337338
"unicode-display_width-2.6.0": "12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a",
338339
"webmock-3.24.0": "be01357f6fc773606337ca79f3ba332b7d52cbe5c27587671abc0572dbec7122",
339-
"webrick-1.8.2": "431746a349199546ff9dd272cae10849c865f938216e41c402a6489248f12f21",
340+
"webrick-1.9.0": "9ee50c57006489960b2a07544f68de6f23dfbee30e7b424167b5c14b72ace964",
340341
"websocket-1.2.11": "b7e7a74e2410b5e85c25858b26b3322f29161e300935f70a0e0d3c35e0462737",
341342
"yard-0.9.37": "a6e910399e78e613f80ba9add9ba7c394b1a935f083cccbef82903a3d2a26992",
342343
},
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>FedCM Example</title>
5+
</head>
6+
<body>
7+
<button id="triggerButton" onclick="triggerFedCm()">Trigger FedCM</button>
8+
<div id="result"></div>
9+
10+
<script>
11+
// Use a relative path for the configURL
12+
let configURL = `http://${location.host}/common/fedcm/config.json`;
13+
console.log(configURL)
14+
let result = null;
15+
16+
async function triggerFedCm() {
17+
console.log("Config URL:", configURL);
18+
try {
19+
let promise = await navigator.credentials.get({
20+
identity: {
21+
providers: [{
22+
configURL: configURL,
23+
clientId: '1',
24+
}]
25+
}
26+
});
27+
result = promise;
28+
29+
console.log("Promised!")
30+
console.log(result)
31+
document.getElementById('result').innerText = JSON.stringify(result);
32+
} catch (error) {
33+
console.error("FedCM Error:", error);
34+
result = { error: error.message };
35+
document.getElementById('result').innerText = JSON.stringify(result);
36+
}
37+
}
38+
</script>
39+
</body>
40+
</html>

dotnet/src/webdriver/CookieJar.cs

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,20 @@ public ReadOnlyCollection<Cookie> AllCookies
3636
{
3737
Response response = driver.InternalExecute(DriverCommand.GetAllCookies, new Dictionary<string, object>());
3838

39-
try
39+
List<Cookie> toReturn = new List<Cookie>();
40+
if (response.Value is object?[] cookies)
4041
{
41-
List<Cookie> toReturn = new List<Cookie>();
42-
if (response.Value is object?[] cookies)
42+
foreach (object? rawCookie in cookies)
4343
{
44-
foreach (object? rawCookie in cookies)
44+
if (rawCookie != null)
4545
{
46-
if (rawCookie != null)
47-
{
48-
Cookie newCookie = Cookie.FromDictionary((Dictionary<string, object?>)rawCookie);
49-
toReturn.Add(newCookie);
50-
}
46+
Cookie newCookie = Cookie.FromDictionary((Dictionary<string, object?>)rawCookie);
47+
toReturn.Add(newCookie);
5148
}
5249
}
53-
54-
return new ReadOnlyCollection<Cookie>(toReturn);
55-
}
56-
catch (Exception e)
57-
{
58-
throw new WebDriverException("Unexpected problem getting cookies", e);
5950
}
51+
52+
return new ReadOnlyCollection<Cookie>(toReturn);
6053
}
6154
}
6255

@@ -81,16 +74,16 @@ public void AddCookie(Cookie cookie)
8174
/// Delete the cookie by passing in the name of the cookie
8275
/// </summary>
8376
/// <param name="name">The name of the cookie that is in the browser</param>
84-
/// <exception cref="ArgumentNullException">If <paramref name="name"/> is <see langword="null"/>.</exception>
77+
/// <exception cref="ArgumentException">If <paramref name="name"/> is <see langword="null"/> or <see cref="string.Empty"/>.</exception>
8578
public void DeleteCookieNamed(string name)
8679
{
87-
if (name is null)
80+
if (string.IsNullOrWhiteSpace(name))
8881
{
89-
throw new ArgumentNullException(nameof(name));
82+
throw new ArgumentException("Cookie name cannot be null or empty", nameof(name));
9083
}
9184

92-
Dictionary<string, object> parameters = new Dictionary<string, object>();
93-
parameters.Add("name", name);
85+
Dictionary<string, object> parameters = new() { { "name", name } };
86+
9487
driver.InternalExecute(DriverCommand.DeleteCookie, parameters);
9588
}
9689

@@ -122,24 +115,24 @@ public void DeleteAllCookies()
122115
/// </summary>
123116
/// <param name="name">name of the cookie that needs to be returned</param>
124117
/// <returns>A Cookie from the name; or <see langword="null"/> if not found.</returns>
118+
/// <exception cref="ArgumentException">If <paramref name="name"/> is <see langword="null"/> or <see cref="string.Empty"/>.</exception>
125119
public Cookie? GetCookieNamed(string name)
126120
{
127-
if (name is null)
121+
if (string.IsNullOrWhiteSpace(name))
128122
{
129-
throw new ArgumentNullException(nameof(name));
123+
throw new ArgumentException("Cookie name cannot be null or empty", nameof(name));
130124
}
131125

132-
133-
foreach (Cookie currentCookie in this.AllCookies)
126+
try
134127
{
135-
if (name.Equals(currentCookie.Name))
136-
{
137-
return currentCookie;
138-
}
128+
var rawCookie = driver.InternalExecute(DriverCommand.GetCookie, new() { { "name", name } }).Value;
139129

130+
return Cookie.FromDictionary((Dictionary<string, object>)rawCookie);
131+
}
132+
catch (NoSuchCookieException)
133+
{
134+
return null;
140135
}
141-
142-
return null;
143136
}
144137
}
145138
}

dotnet/src/webdriver/DevTools/DevToolsCommandData.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
// under the License.
1818
// </copyright>
1919

20+
using System.Text.Json;
2021
using System.Text.Json.Nodes;
2122
using System.Text.Json.Serialization;
2223
using System.Threading;
@@ -90,7 +91,7 @@ public DevToolsCommandData(long commandId, string sessionId, string commandName,
9091
/// Get or sets the result of the command execution.
9192
/// </summary>
9293
[JsonIgnore]
93-
public JsonNode Result { get; set; }
94+
public JsonElement Result { get; set; }
9495

9596
/// <summary>
9697
/// Gets or sets a value indicating whether the command resulted in an error response.

0 commit comments

Comments
 (0)