webdriver: Align Send Alert Text To use same properties as Element Se…

…nd Keys (#39)

Instead of Send Alert Text using 'text' it now uses 'value' allowing
us to simplify the parameter checking.

Source-Repo: https://github.com/mozilla/webdriver-rust
Source-Revision: a0240f01f13b8e7e8fcc4cc3b0929675e9e3297c

committer: jgraham <[email protected]>

--HG--
extra : subtree_source : http%3A//tristan.corp.lon2.mozilla.com%3A8000
extra : subtree_revision : 337e13ac8c2f968fae708ccf92829381d107fd50

testing/webdriver/src/command.rs

@@ -60,7 +60,7 @@ pub enum WebDriverCommand<T: WebDriverExtensionCommand> {
     DismissAlert,
     AcceptAlert,
     GetAlertText,
-    SendAlertText(SendAlertTextParameters),
+    SendAlertText(SendKeysParameters),
     TakeScreenshot,
     Extension(T)
 }
@@ -315,7 +315,7 @@ impl <U: WebDriverExtensionRoute> WebDriverMessage<U> {
                 WebDriverCommand::GetAlertText
             },
             Route::SendAlertText => {
-                let parameters: SendAlertTextParameters = try!(Parameters::from_json(&body_data));
+                let parameters: SendKeysParameters = try!(Parameters::from_json(&body_data));
                 WebDriverCommand::SendAlertText(parameters)
             },
             Route::TakeScreenshot => WebDriverCommand::TakeScreenshot,
@@ -940,35 +940,6 @@ impl ToJson for AddCookieParameters {
     }
 }
 
-#[derive(PartialEq)]
-pub struct SendAlertTextParameters {
-    message: String
-}
-
-impl Parameters for SendAlertTextParameters {
-    fn from_json(body: &Json) -> WebDriverResult<SendAlertTextParameters> {
-        let data = try_opt!(body.as_object(), ErrorStatus::InvalidArgument,
-                            "Message body was not an object");
-        let keys = try_opt!(
-            try_opt!(data.get("text"),
-                     ErrorStatus::InvalidArgument,
-                     "Missing 'text' parameter").as_string(),
-            ErrorStatus::InvalidArgument,
-            "'text' not a string").to_string();
-        return Ok(SendAlertTextParameters {
-            message: keys
-        })
-    }
-}
-
-impl ToJson for SendAlertTextParameters {
-    fn to_json(&self) -> Json {
-        let mut data = BTreeMap::new();
-        data.insert("message".to_string(), self.message.to_json());
-        Json::Object(data)
-    }
-}
-
 #[derive(PartialEq)]
 pub struct TakeScreenshotParameters {
     pub element: Nullable<WebElement>