From 6dcd7fd3c21800201022915111a0ff159e158411 Mon Sep 17 00:00:00 2001 From: hundredeir <20334754+hundredeir@users.noreply.github.com> Date: Wed, 10 Apr 2019 20:08:49 +0530 Subject: [PATCH] Refactor code --- components/webdriver_server/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 41e91235ee1..07c056a0e07 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -804,7 +804,7 @@ impl Handler { } // https://w3c.github.io/webdriver/#find-elements-from-element - fn handle_find_element_elements( + fn handle_find_elements_from_element( &self, element: &WebElement, parameters: &LocatorParameters, @@ -828,10 +828,10 @@ impl Handler { match receiver.recv().unwrap() { Ok(value) => { let value_resp = value - .into_iter() + .into_iter() .map(|x| serde_json::to_value(WebElement::new(x)).unwrap()) .collect::>(); - let value_resp = serde_json::to_value(value_resp).unwrap(); + let value_resp = serde_json::Value::Array(value_resp); Ok(WebDriverResponse::Generic(ValueResponse(value_resp))) }, Err(_) => Err(WebDriverError::new( @@ -1281,7 +1281,7 @@ impl WebDriverHandler for Handler { self.handle_find_element_element(element, parameters) }, WebDriverCommand::FindElementElements(ref element, ref parameters) => { - self.handle_find_element_elements(element, parameters) + self.handle_find_elements_from_element(element, parameters) }, WebDriverCommand::GetNamedCookie(ref name) => self.handle_get_cookie(name), WebDriverCommand::GetCookies => self.handle_get_cookies(),