Add WebDriver support for getting elements by selector.

Also adds example support for getting the name and text properties of the elements.

5 files changed, 163 insertions, 10 deletions

diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 048ee28b3a9..ff69e4552a6 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -975,20 +975,17 @@ impl<'a> NodeHelpers for JSRef<'a, Node> {
 
     fn get_unique_id(self) -> String {
         // FIXME(https://github.com/rust-lang/rust/issues/23338)
-        let id = self.unique_id.borrow();
-        id.clone()
-    }
-
-    fn summarize(self) -> NodeInfo {
         if self.unique_id.borrow().is_empty() {
             let mut unique_id = self.unique_id.borrow_mut();
             *unique_id = uuid::Uuid::new_v4().to_simple_string();
         }
+        let id = self.unique_id.borrow();
+        id.clone()
+    }
 
-        // FIXME(https://github.com/rust-lang/rust/issues/23338)
-        let unique_id = self.unique_id.borrow();
+    fn summarize(self) -> NodeInfo {
         NodeInfo {
-            uniqueId: unique_id.clone(),
+            uniqueId: self.get_unique_id(),
             baseURI: self.GetBaseURI().unwrap_or("".to_owned()),
             parent: self.GetParentNode().root().map(|node| node.r().get_unique_id()).unwrap_or("".to_owned()),
             nodeType: self.NodeType(),
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 12ae363c95b..6073441e675 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -791,6 +791,14 @@ impl ScriptTask {
         match msg {
             WebDriverScriptCommand::EvaluateJS(script, reply) =>
                 webdriver_handlers::handle_evaluate_js(&page, pipeline_id, script, reply),
+            WebDriverScriptCommand::FindElementCSS(selector, reply) =>
+                webdriver_handlers::handle_find_element_css(&page, pipeline_id, selector, reply),
+            WebDriverScriptCommand::FindElementsCSS(selector, reply) =>
+                webdriver_handlers::handle_find_elements_css(&page, pipeline_id, selector, reply),
+            WebDriverScriptCommand::GetElementTagName(node_id, reply) =>
+                webdriver_handlers::handle_get_name(&page, pipeline_id, node_id, reply),
+            WebDriverScriptCommand::GetElementText(node_id, reply) =>
+                webdriver_handlers::handle_get_text(&page, pipeline_id, node_id, reply),
             WebDriverScriptCommand::GetTitle(reply) =>
                 webdriver_handlers::handle_get_title(&page, pipeline_id, reply)
         }
diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs
index f9ff918c60e..da783880989 100644
--- a/components/script/webdriver_handlers.rs
+++ b/components/script/webdriver_handlers.rs
@@ -5,8 +5,13 @@
 use webdriver_traits::{EvaluateJSReply};
 use dom::bindings::conversions::FromJSValConvertible;
 use dom::bindings::conversions::StringificationBehavior;
+use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast};
 use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
-use dom::bindings::js::{OptionalRootable, Rootable};
+use dom::bindings::codegen::Bindings::ElementBinding::ElementMethods;
+use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
+use dom::bindings::codegen::Bindings::NodeListBinding::NodeListMethods;
+use dom::bindings::js::{OptionalRootable, Rootable, Temporary};
+use dom::node::{Node, NodeHelpers};
 use dom::window::ScriptHelpers;
 use dom::document::DocumentHelpers;
 use page::Page;
@@ -16,6 +21,20 @@ use script_task::get_page;
 use std::rc::Rc;
 use std::sync::mpsc::Sender;
 
+fn find_node_by_unique_id(page: &Rc<Page>, pipeline: PipelineId, node_id: String) -> Option<Temporary<Node>> {
+    let page = get_page(&*page, pipeline);
+    let document = page.document().root();
+    let node = NodeCast::from_ref(document.r());
+
+    for candidate in node.traverse_preorder() {
+        if candidate.root().r().get_unique_id() == node_id {
+            return Some(candidate);
+        }
+    }
+
+    None
+}
+
 pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, reply: Sender<Result<EvaluateJSReply, ()>>) {
     let page = get_page(&*page, pipeline);
     let window = page.window().root();
@@ -38,6 +57,54 @@ pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, r
     }).unwrap();
 }
 
+pub fn handle_find_element_css(page: &Rc<Page>, _pipeline: PipelineId, selector: String, reply: Sender<Result<Option<String>, ()>>) {
+    reply.send(match page.document().root().r().QuerySelector(selector.clone()) {
+        Ok(node) => {
+            let result = node.map(|x| NodeCast::from_ref(x.root().r()).get_unique_id());
+            Ok(result)
+        }
+        Err(_) => Err(())
+    }).unwrap();
+}
+
+pub fn handle_find_elements_css(page: &Rc<Page>, _pipeline: PipelineId, selector: String, reply: Sender<Result<Vec<String>, ()>>) {
+    reply.send(match page.document().root().r().QuerySelectorAll(selector.clone()) {
+        Ok(ref node_list) => {
+            let nodes = node_list.root();
+            let mut result = Vec::with_capacity(nodes.r().Length() as usize);
+            for i in 0..nodes.r().Length() {
+                if let Some(ref node) = nodes.r().Item(i) {
+                    result.push(node.root().r().get_unique_id());
+                }
+            }
+            Ok(result)
+        },
+        Err(_) => {
+            Err(())
+        }
+    }).unwrap();
+}
+
 pub fn handle_get_title(page: &Rc<Page>, _pipeline: PipelineId, reply: Sender<String>) {
     reply.send(page.document().root().r().Title()).unwrap();
 }
+
+pub fn handle_get_text(page: &Rc<Page>, pipeline: PipelineId, node_id: String, reply: Sender<Result<String, ()>>) {
+    reply.send(match find_node_by_unique_id(&*page, pipeline, node_id) {
+        Some(ref node) => {
+            Ok(node.root().r().GetTextContent().unwrap_or("".to_owned()))
+        },
+        None => Err(())
+    }).unwrap();
+}
+
+pub fn handle_get_name(page: &Rc<Page>, pipeline: PipelineId, node_id: String, reply: Sender<Result<String, ()>>) {
+    reply.send(match find_node_by_unique_id(&*page, pipeline, node_id) {
+        Some(tmp_node) => {
+            let node = tmp_node.root();
+            let element = ElementCast::to_ref(node.r()).unwrap();
+            Ok(element.TagName())
+        },
+        None => Err(())
+    }).unwrap();
+}
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index eed93e75ad7..e86fb43f663 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -26,7 +26,8 @@ use webdriver_traits::WebDriverScriptCommand;
 
 use url::Url;
 use webdriver::command::{WebDriverMessage, WebDriverCommand};
-use webdriver::command::{GetParameters, JavascriptCommandParameters};
+use webdriver::command::{GetParameters, JavascriptCommandParameters, LocatorParameters};
+use webdriver::common::{LocatorStrategy, WebElement};
 use webdriver::response::{
     WebDriverResponse, NewSessionResponse, ValueResponse};
 use webdriver::server::{self, WebDriverHandler, Session};
@@ -151,6 +152,78 @@ impl Handler {
         Ok(WebDriverResponse::Generic(ValueResponse::new(handles.to_json())))
     }
 
+    fn handle_find_element(&self, parameters: &LocatorParameters) -> WebDriverResult<WebDriverResponse> {
+        let pipeline_id = self.get_root_pipeline();
+
+        if parameters.using != LocatorStrategy::CSSSelector {
+            return Err(WebDriverError::new(ErrorStatus::UnsupportedOperation,
+                                           "Unsupported locator strategy"))
+        }
+
+        let (sender, reciever) = channel();
+        let ConstellationChan(ref const_chan) = self.constellation_chan;
+        let cmd = WebDriverScriptCommand::FindElementCSS(parameters.value.clone(), sender);
+        const_chan.send(ConstellationMsg::WebDriverCommand(pipeline_id, cmd)).unwrap();
+        match reciever.recv().unwrap() {
+            Ok(value) => {
+                Ok(WebDriverResponse::Generic(ValueResponse::new(value.map(|x| WebElement::new(x).to_json()).to_json())))
+            }
+            Err(_) => Err(WebDriverError::new(ErrorStatus::InvalidSelector,
+                                              "Invalid selector"))
+        }
+    }
+
+    fn handle_find_elements(&self, parameters: &LocatorParameters) -> WebDriverResult<WebDriverResponse> {
+        let pipeline_id = self.get_root_pipeline();
+
+        if parameters.using != LocatorStrategy::CSSSelector {
+            return Err(WebDriverError::new(ErrorStatus::UnsupportedOperation,
+                                           "Unsupported locator strategy"))
+        }
+
+        let (sender, reciever) = channel();
+        let ConstellationChan(ref const_chan) = self.constellation_chan;
+        let cmd = WebDriverScriptCommand::FindElementsCSS(parameters.value.clone(), sender);
+        const_chan.send(ConstellationMsg::WebDriverCommand(pipeline_id, cmd)).unwrap();
+        match reciever.recv().unwrap() {
+            Ok(value) => {
+                let resp_value: Vec<Json> = value.into_iter().map(
+                    |x| WebElement::new(x).to_json()).collect();
+                Ok(WebDriverResponse::Generic(ValueResponse::new(resp_value.to_json())))
+            }
+            Err(_) => Err(WebDriverError::new(ErrorStatus::InvalidSelector,
+                                              "Invalid selector"))
+        }
+    }
+
+    fn handle_get_element_text(&self, element: &WebElement) -> WebDriverResult<WebDriverResponse> {
+        let pipeline_id = self.get_root_pipeline();
+
+        let (sender, reciever) = channel();
+        let ConstellationChan(ref const_chan) = self.constellation_chan;
+        let cmd = WebDriverScriptCommand::GetElementText(element.id.clone(), sender);
+        const_chan.send(ConstellationMsg::WebDriverCommand(pipeline_id, cmd)).unwrap();
+        match reciever.recv().unwrap() {
+            Ok(value) => Ok(WebDriverResponse::Generic(ValueResponse::new(value.to_json()))),
+            Err(_) => Err(WebDriverError::new(ErrorStatus::StaleElementReference,
+                                              "Unable to find element in document"))
+        }
+    }
+
+    fn handle_get_element_tag_name(&self, element: &WebElement) -> WebDriverResult<WebDriverResponse> {
+        let pipeline_id = self.get_root_pipeline();
+
+        let (sender, reciever) = channel();
+        let ConstellationChan(ref const_chan) = self.constellation_chan;
+        let cmd = WebDriverScriptCommand::GetElementTagName(element.id.clone(), sender);
+        const_chan.send(ConstellationMsg::WebDriverCommand(pipeline_id, cmd)).unwrap();
+        match reciever.recv().unwrap() {
+            Ok(value) => Ok(WebDriverResponse::Generic(ValueResponse::new(value.to_json()))),
+            Err(_) => Err(WebDriverError::new(ErrorStatus::StaleElementReference,
+                                              "Unable to find element in document"))
+        }
+    }
+
     fn handle_execute_script(&self, parameters: &JavascriptCommandParameters)  -> WebDriverResult<WebDriverResponse> {
         // TODO: This isn't really right because it always runs the script in the
         // root window
@@ -228,6 +301,10 @@ impl WebDriverHandler for Handler {
             WebDriverCommand::GetTitle => self.handle_get_title(),
             WebDriverCommand::GetWindowHandle => self.handle_get_window_handle(),
             WebDriverCommand::GetWindowHandles => self.handle_get_window_handles(),
+            WebDriverCommand::FindElement(ref parameters) => self.handle_find_element(parameters),
+            WebDriverCommand::FindElements(ref parameters) => self.handle_find_elements(parameters),
+            WebDriverCommand::GetElementText(ref element) => self.handle_get_element_text(element),
+            WebDriverCommand::GetElementTagName(ref element) => self.handle_get_element_tag_name(element),
             WebDriverCommand::ExecuteScript(ref x) => self.handle_execute_script(x),
             WebDriverCommand::TakeScreenshot => self.handle_take_screenshot(),
             _ => Err(WebDriverError::new(ErrorStatus::UnsupportedOperation,
diff --git a/components/webdriver_traits/lib.rs b/components/webdriver_traits/lib.rs
index 8e816165722..ff2ff18e52f 100644
--- a/components/webdriver_traits/lib.rs
+++ b/components/webdriver_traits/lib.rs
@@ -12,6 +12,10 @@ use std::sync::mpsc::Sender;
 
 pub enum WebDriverScriptCommand {
     EvaluateJS(String, Sender<Result<EvaluateJSReply, ()>>),
+    FindElementCSS(String, Sender<Result<Option<String>, ()>>),
+    FindElementsCSS(String, Sender<Result<Vec<String>, ()>>),
+    GetElementTagName(String, Sender<Result<String, ()>>),
+    GetElementText(String, Sender<Result<String, ()>>),
     GetTitle(Sender<String>)
 }