Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

[WebDriver: handle_get_shadow_root] Fix Serialization problem (#37564)

Browse source 
1. Correctly Serialize the ShadowRoot. Previously, it contains a nested
element identifier "element-6066-11e4-a52e-4f735466cecf"
2. Improve coding style with what I learnt from Josh today

Testing: Passing way more "Find Elements from Shadow Root" test locally
now
Fixes: #37559

---------

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>
This commit is contained in:
Euclid Ye 2025-06-20 11:07:36 +08:00 • committed by GitHub
parent 7d1d50f703
commit b331cb4603
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/webdriver_server/lib.rs
View file

@ -55,7 +55,7 @@ use webdriver::command::{
SwitchToFrameParameters, SwitchToWindowParameters, TimeoutsParameters, WebDriverCommand, SwitchToFrameParameters, SwitchToWindowParameters, TimeoutsParameters, WebDriverCommand,
WebDriverExtensionCommand, WebDriverMessage, WindowRectParameters, WebDriverExtensionCommand, WebDriverMessage, WindowRectParameters,
}; };
use webdriver::common::{Cookie, Date, LocatorStrategy, Parameters, WebElement}; use webdriver::common::{Cookie, Date, LocatorStrategy, Parameters, ShadowRoot, WebElement};
use webdriver::error::{ErrorStatus, WebDriverError, WebDriverResult}; use webdriver::error::{ErrorStatus, WebDriverError, WebDriverResult};
use webdriver::httpapi::WebDriverExtensionRoute; use webdriver::httpapi::WebDriverExtensionRoute;
use webdriver::response::{ use webdriver::response::{
@ -1347,17 +1347,12 @@ impl Handler {
self.browsing_context_script_command(cmd)?; self.browsing_context_script_command(cmd)?;
match wait_for_script_response(receiver)? { match wait_for_script_response(receiver)? {
Ok(value) => { Ok(value) => {
if value.is_none() { let Some(value) = value else {
return Err(WebDriverError::new( return Err(WebDriverError::new(ErrorStatus::NoSuchShadowRoot, ""));
ErrorStatus::NoSuchShadowRoot, };
"No shadow root found for the element", Ok(WebDriverResponse::Generic(ValueResponse(
)); serde_json::to_value(ShadowRoot(value))?,
} )))
let value_resp = serde_json::to_value(
value.map(|x| serde_json::to_value(WebElement(x)).unwrap()),
)?;
let shadow_root_value = json!({ SHADOW_ROOT_IDENTIFIER: value_resp });
Ok(WebDriverResponse::Generic(ValueResponse(shadow_root_value)))
}, },
Err(error) => Err(WebDriverError::new(error, "")), Err(error) => Err(WebDriverError::new(error, "")),
} }