Add webdriver command Find elements from element

4 files changed, 67 insertions, 1 deletions

diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 28a9a52566f..e9afeed8cd5 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -1872,6 +1872,15 @@ impl ScriptThread {
                     reply,
                 )
             },
+            WebDriverScriptCommand::FindElementElementsCSS(selector,element_id,reply) => {
+                webdriver_handlers::handle_find_element_elements_css(
+                    &*documents,
+                    pipeline_id,
+                    element_id,
+                    selector,
+                    reply,
+                )
+            },
             WebDriverScriptCommand::FocusElement(element_id, reply) => {
                 webdriver_handlers::handle_focus_element(
                     &*documents,
diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs
index 89e2df12c9d..e3723ac51cd 100644
--- a/components/script/webdriver_handlers.rs
+++ b/components/script/webdriver_handlers.rs
@@ -220,6 +220,27 @@ pub fn handle_find_element_element_css(
     reply.send(node_id).unwrap();
 }
 
+pub fn handle_find_element_elements_css(
+    documents: &Documents,
+    pipeline: PipelineId,
+    element_id: String,
+    selector: String,
+    reply: IpcSender<Result<Option<String>, ()>>,
+){
+    let node_ids = find_node_by_unique_id(documents,pipeline,element_id)
+        .ok_or(())
+        .and_then(|node|{
+            node.query_selector_all(DOMString::from(selector)).map_err(|_| ())
+        })
+        .map(|nodes| {
+            nodes
+                .iter()
+                .map(|x| Some(x.upcast::<Node>().unique_id()))
+                .collect()
+        });
+    reply.send(node_ids).unwrap();
+}
+
 pub fn handle_focus_element(
     documents: &Documents,
     pipeline: PipelineId,
diff --git a/components/script_traits/webdriver_msg.rs b/components/script_traits/webdriver_msg.rs
index 157ea3aa7a9..3d4b10ac4b3 100644
--- a/components/script_traits/webdriver_msg.rs
+++ b/components/script_traits/webdriver_msg.rs
@@ -26,6 +26,7 @@ pub enum WebDriverScriptCommand {
     FindElementCSS(String, IpcSender<Result<Option<String>, ()>>),
     FindElementsCSS(String, IpcSender<Result<Vec<String>, ()>>),
     FindElementElementCSS(String, String, IpcSender<Result<Option<String>, ()>>),
+    FindElementElementsCSS(String, String, IpcSender<Result<Option<String>, ()>>),
     FocusElement(String, IpcSender<Result<(), ()>>),
     GetActiveElement(IpcSender<Option<String>>),
     GetCookie(String, IpcSender<Vec<Serde<Cookie<'static>>>>),
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index bf838715a4c..966e6d91ddf 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -803,6 +803,38 @@ impl Handler {
         }
     }
 
+
+    // https://w3c.github.io/webdriver/#find-elements-from-element
+    fn handle_find_element_elements(&self,
+                                    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 receiver.recv().unwrap(){
+            Ok(value) => {
+                let value_resp = value.into_iter() //maybe into_iter is superfluous
+                    .map(|x| serde_json::to_value(WebElement::new(x)) .unwrap())
+                    .collect::<Vec<Value>>();
+                let value_resp = serde_json::to_value(value_resp).unwrap();
+                Ok(WebDriverResponse::Generic(ValueResponse(value_resp)))
+            },
+            Err(_) => Err(WebDriverError::new(
+                ErrorStatus::InvalidSelector,"Invalid Selector",))
+        }
+
+    }
+
     // https://w3c.github.io/webdriver/webdriver-spec.html#get-element-rect
     fn handle_element_rect(&self, element: &WebElement) -> WebDriverResult<WebDriverResponse> {
         let (sender, receiver) = ipc::channel().unwrap();
@@ -1242,6 +1274,9 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler {
             WebDriverCommand::FindElementElement(ref element, ref parameters) => {
                 self.handle_find_element_element(element, parameters)
             },
+            WebDriverCommand::FindElementElements(ref element,ref parameters) => {
+                self.handle_find_element_elements(element, parameters)
+            },
             WebDriverCommand::GetNamedCookie(ref name) => self.handle_get_cookie(name),
             WebDriverCommand::GetCookies => self.handle_get_cookies(),
             WebDriverCommand::GetActiveElement => self.handle_active_element(),
@@ -1270,7 +1305,7 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler {
             },
             _ => Err(WebDriverError::new(
                 ErrorStatus::UnsupportedOperation,
-                "Command not implemented",
+                format!("Command not implemented: {:?}", msg.command),
             )),
         }
     }