mirror of
https://github.com/servo/servo.git
synced 2025-08-05 05:30:08 +01:00
Implement tag name selector for FindElementsFromElement WebDriver command
This commit is contained in:
parent
616a81fb27
commit
bf6ea64e8c
5 changed files with 65 additions and 27 deletions
|
@ -997,34 +997,46 @@ impl Handler {
|
|||
element: &WebElement,
|
||||
parameters: &LocatorParameters,
|
||||
) -> WebDriverResult<WebDriverResponse> {
|
||||
if parameters.using != LocatorStrategy::CSSSelector {
|
||||
return Err(WebDriverError::new(
|
||||
ErrorStatus::UnsupportedOperation,
|
||||
"Unsupported locator strategy",
|
||||
));
|
||||
}
|
||||
|
||||
let (sender, receiver) = ipc::channel().unwrap();
|
||||
let cmd = WebDriverScriptCommand::FindElementElementsCSS(
|
||||
parameters.value.clone(),
|
||||
element.id.clone(),
|
||||
sender,
|
||||
);
|
||||
|
||||
self.browsing_context_script_command(cmd)?;
|
||||
match parameters.using {
|
||||
LocatorStrategy::CSSSelector => {
|
||||
let cmd = WebDriverScriptCommand::FindElementElementsCSS(
|
||||
parameters.value.clone(),
|
||||
element.id.clone(),
|
||||
sender,
|
||||
);
|
||||
self.browsing_context_script_command(cmd)?;
|
||||
},
|
||||
LocatorStrategy::TagName => {
|
||||
let cmd = WebDriverScriptCommand::FindElementElementsTagName(
|
||||
parameters.value.clone(),
|
||||
element.id.clone(),
|
||||
sender,
|
||||
);
|
||||
self.browsing_context_script_command(cmd)?;
|
||||
},
|
||||
_ => {
|
||||
return Err(WebDriverError::new(
|
||||
ErrorStatus::UnsupportedOperation,
|
||||
"Unsupported locator strategy",
|
||||
));
|
||||
},
|
||||
}
|
||||
|
||||
match receiver.recv().unwrap() {
|
||||
Ok(value) => {
|
||||
let value_resp = value
|
||||
let resp_value: Vec<Value> = value
|
||||
.into_iter()
|
||||
.map(|x| serde_json::to_value(WebElement::new(x)).unwrap())
|
||||
.collect::<Vec<Value>>();
|
||||
let value_resp = serde_json::Value::Array(value_resp);
|
||||
Ok(WebDriverResponse::Generic(ValueResponse(value_resp)))
|
||||
.collect();
|
||||
Ok(WebDriverResponse::Generic(ValueResponse(
|
||||
serde_json::to_value(resp_value)?,
|
||||
)))
|
||||
},
|
||||
Err(_) => Err(WebDriverError::new(
|
||||
ErrorStatus::InvalidSelector,
|
||||
"Invalid Selector",
|
||||
"Invalid selector",
|
||||
)),
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue