mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-05-22 19:12:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb: Update (not replace) timeout values in WebDriver's Set Timeouts

Browse source 
Contradictory to the spec, the Set Timeouts endpoint should update the
existing timeouts configuration in-place, rather than replacing it. WPT
expects this, and other browsers already implement this endpoint this
way.
This commit is contained in:
Timothy Flynn 2024-10-11 15:15:06 -04:00 • committed by Andreas Kling
parent 8396afeb76
commit dae6200c1d
Notes: github-actions[bot] 2024-10-12 13:03:32 +00:00
3 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibWeb/WebDriver/TimeoutsConfiguration.cpp
View file

@ -31,14 +31,23 @@ JsonObject timeouts_object(TimeoutsConfiguration const& timeouts)
// https://w3c.github.io/webdriver/#dfn-deserialize-as-timeouts-configuration
ErrorOr<TimeoutsConfiguration, Error> json_deserialize_as_a_timeouts_configuration(JsonValue const& timeouts)
{
// 2. Let configuration be a new timeouts configuration.
TimeoutsConfiguration configuration {};
TRY(json_deserialize_as_a_timeouts_configuration_into(timeouts, configuration));
// 4. Return success with data configuration.
return configuration;
}
// https://w3c.github.io/webdriver/#dfn-deserialize-as-timeouts-configuration
ErrorOr<void, Error> json_deserialize_as_a_timeouts_configuration_into(JsonValue const& timeouts, TimeoutsConfiguration& configuration)
{
// 1. Set timeouts to the result of converting a JSON-derived JavaScript value to an Infra value with timeouts.
if (!timeouts.is_object())
return Error::from_code(ErrorCode::InvalidArgument, "Payload is not a JSON object");
// 2. Let configuration be a new timeouts configuration.
TimeoutsConfiguration configuration {};
// 3. For each key → value in timeouts:
TRY(timeouts.as_object().try_for_each_member([&](auto const& key, JsonValue const& value) -> ErrorOr<void, Error> {
Optional<u64> parsed_value;
@ -78,8 +87,7 @@ ErrorOr<TimeoutsConfiguration, Error> json_deserialize_as_a_timeouts_configurati
return {};
}));
// 4. Return success with data configuration.
return configuration;
return {};
}
}

1
Userland/Libraries/LibWeb/WebDriver/TimeoutsConfiguration.h
View file

@ -21,5 +21,6 @@ struct TimeoutsConfiguration {
JsonObject timeouts_object(TimeoutsConfiguration const&);
ErrorOr<TimeoutsConfiguration, Error> json_deserialize_as_a_timeouts_configuration(JsonValue const&);
ErrorOr<void, Error> json_deserialize_as_a_timeouts_configuration_into(JsonValue const&, TimeoutsConfiguration&);
}

8
Userland/Services/WebContent/WebDriverConnection.cpp
View file

@ -243,11 +243,15 @@ Messages::WebDriverClient::GetTimeoutsResponse WebDriverConnection::get_timeouts
// 9.2 Set Timeouts, https://w3c.github.io/webdriver/#dfn-set-timeouts
Messages::WebDriverClient::SetTimeoutsResponse WebDriverConnection::set_timeouts(JsonValue const& payload)
{
// FIXME: Spec issue: As written, the spec replaces the timeouts configuration with the newly provided values. But
// all other implementations update the existing configuration with any new values instead. WPT relies on
// this behavior, and sends us one timeout value at time.
// https://github.com/w3c/webdriver/issues/1596
// 1. Let timeouts be the result of trying to JSON deserialize as a timeouts configuration the request’s parameters.
auto timeouts = TRY(Web::WebDriver::json_deserialize_as_a_timeouts_configuration(payload));
TRY(Web::WebDriver::json_deserialize_as_a_timeouts_configuration_into(payload, m_timeouts_configuration));
// 2. Make the session timeouts the new timeouts.
m_timeouts_configuration = move(timeouts);
// 3. Return success with data null.
return JsonValue {};