RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 16:37:47 +00:00
Code Issues Activity Actions

WebDriver: Use WebDriverError::from_code() for all error creation

Browse source
This commit is contained in:
Sam Atkins 2022-10-20 14:00:49 +01:00 • committed by Linus Groh
parent 9393904073
commit 3232622255
4 changed files with 86 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Services/WebDriver/TimeoutsConfiguration.cpp
View file

@ -44,7 +44,7 @@ ErrorOr<TimeoutsConfiguration, WebDriverError> json_deserialize_as_a_timeouts_co
// 2. If value is not a JSON Object, return error with error code invalid argument.
if (!value.is_object())
return WebDriverError { 400, "invalid argument", "Payload is not a JSON object" };
return WebDriverError::from_code(ErrorCode::InvalidArgument, "Payload is not a JSON object");
// 3. If value has a property with the key "script":
if (value.as_object().has("script"sv)) {
@ -53,7 +53,7 @@ ErrorOr<TimeoutsConfiguration, WebDriverError> json_deserialize_as_a_timeouts_co
// 2. If script duration is a number and less than 0 or greater than maximum safe integer, or it is not null, return error with error code invalid argument.
if ((script_duration.is_number() && (script_duration.to_i64() < 0 || script_duration.to_i64() > max_safe_integer)) || !script_duration.is_null())
return WebDriverError { 400, "invalid argument", "Invalid script duration" };
return WebDriverError::from_code(ErrorCode::InvalidArgument, "Invalid script duration");
// 3. Set timeouts’s script timeout to script duration.
timeouts.script_timeout = script_duration.is_null() ? Optional<u64> {} : script_duration.to_u64();
@ -66,7 +66,7 @@ ErrorOr<TimeoutsConfiguration, WebDriverError> json_deserialize_as_a_timeouts_co
// 2. If page load duration is less than 0 or greater than maximum safe integer, return error with error code invalid argument.
if (!page_load_duration.is_number() || page_load_duration.to_i64() < 0 || page_load_duration.to_i64() > max_safe_integer)
return WebDriverError { 400, "invalid argument", "Invalid page load duration" };
return WebDriverError::from_code(ErrorCode::InvalidArgument, "Invalid page load duration");
// 3. Set timeouts’s page load timeout to page load duration.
timeouts.page_load_timeout = page_load_duration.to_u64();
@ -79,7 +79,7 @@ ErrorOr<TimeoutsConfiguration, WebDriverError> json_deserialize_as_a_timeouts_co
// 2. If implicit duration is less than 0 or greater than maximum safe integer, return error with error code invalid argument.
if (!implicit_duration.is_number() || implicit_duration.to_i64() < 0 || implicit_duration.to_i64() > max_safe_integer)
return WebDriverError { 400, "invalid argument", "Invalid implicit duration" };
return WebDriverError::from_code(ErrorCode::InvalidArgument, "Invalid implicit duration");
// 3. Set timeouts’s implicit wait timeout to implicit duration.
timeouts.implicit_wait_timeout = implicit_duration.to_u64();