Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

webdriver: Merge pull request #61 from upsuper/upgrade-regex

Browse Source 
Upgrade regex to 0.2

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

--HG--
extra : subtree_source : http%3A//tristan.corp.lon2.mozilla.com%3A8000
extra : subtree_revision : a20fe4dfb9a5b6bb0692e7ab4bb1b2fd9db7ec70
This commit is contained in:
Xidorn Quan 2017-01-11 13:10:00 +00:00
parent 5a1753bfe7
commit 3feb37600c
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/webdriver/Cargo.toml
View File

@ -1,7 +1,7 @@
[package]
name = "webdriver"
version = "0.18.0"
version = "0.18.1"
authors = ["Mozilla Tools and Automation <auto-tools@mozilla.com>"]
description = "Library implementing the wire protocol for the W3C WebDriver specification."
repository = "https://github.com/jgraham/webdriver-rust"
@ -9,7 +9,7 @@ license = "MPL-2.0"
[dependencies]
log = "0.3"
regex = "0.1"
regex = "0.2"
rustc-serialize = "0.3"
hyper = {version = "0.9", default-features = false}
cookie = {version = "0.2", default-features = false}

50
testing/webdriver/src/command.rs
View File

@ -166,7 +166,7 @@ impl <U: WebDriverExtensionRoute> WebDriverMessage<U> {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
let parameters: LocatorParameters = try!(Parameters::from_json(&body_data));
WebDriverCommand::FindElementElement(element, parameters)
},
@ -174,7 +174,7 @@ impl <U: WebDriverExtensionRoute> WebDriverMessage<U> {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
let parameters: LocatorParameters = try!(Parameters::from_json(&body_data));
WebDriverCommand::FindElementElements(element, parameters)
},
@ -183,100 +183,100 @@ impl <U: WebDriverExtensionRoute> WebDriverMessage<U> {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
WebDriverCommand::IsDisplayed(element)
},
Route::IsSelected => {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
WebDriverCommand::IsSelected(element)
},
Route::GetElementAttribute => {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
let attr = try_opt!(params.name("name"),
ErrorStatus::InvalidArgument,
"Missing name parameter").to_string();
WebDriverCommand::GetElementAttribute(element, attr)
"Missing name parameter").as_str();
WebDriverCommand::GetElementAttribute(element, attr.into())
},
Route::GetElementProperty => {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
let property = try_opt!(params.name("name"),
ErrorStatus::InvalidArgument,
"Missing name parameter").to_string();
WebDriverCommand::GetElementProperty(element, property)
"Missing name parameter").as_str();
WebDriverCommand::GetElementProperty(element, property.into())
},
Route::GetCSSValue => {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
let property = try_opt!(params.name("propertyName"),
ErrorStatus::InvalidArgument,
"Missing propertyName parameter").to_string();
WebDriverCommand::GetCSSValue(element, property)
"Missing propertyName parameter").as_str();
WebDriverCommand::GetCSSValue(element, property.into())
},
Route::GetElementText => {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
WebDriverCommand::GetElementText(element)
},
Route::GetElementTagName => {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
WebDriverCommand::GetElementTagName(element)
},
Route::GetElementRect => {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
WebDriverCommand::GetElementRect(element)
},
Route::IsEnabled => {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
WebDriverCommand::IsEnabled(element)
},
Route::ElementClick => {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
WebDriverCommand::ElementClick(element)
},
Route::ElementTap => {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
WebDriverCommand::ElementTap(element)
},
Route::ElementClear => {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
WebDriverCommand::ElementClear(element)
},
Route::ElementSendKeys => {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
let parameters: SendKeysParameters = try!(Parameters::from_json(&body_data));
WebDriverCommand::ElementSendKeys(element, parameters)
},
@ -294,7 +294,7 @@ impl <U: WebDriverExtensionRoute> WebDriverMessage<U> {
Route::GetCookie => {
let name = try_opt!(params.name("name"),
ErrorStatus::InvalidArgument,
"Missing name parameter").to_string();
"Missing name parameter").as_str().into();
WebDriverCommand::GetCookie(name)
},
Route::AddCookie => {
@ -307,7 +307,7 @@ impl <U: WebDriverExtensionRoute> WebDriverMessage<U> {
Route::DeleteCookie => {
let name = try_opt!(params.name("name"),
ErrorStatus::InvalidArgument,
"Missing name parameter").to_string();
"Missing name parameter").as_str().into();
WebDriverCommand::DeleteCookie(name)
},
Route::PerformActions => {
@ -335,7 +335,7 @@ impl <U: WebDriverExtensionRoute> WebDriverMessage<U> {
let element_id = try_opt!(params.name("elementId"),
ErrorStatus::InvalidArgument,
"Missing elementId parameter");
let element = WebElement::new(element_id.to_string());
let element = WebElement::new(element_id.as_str().into());
WebDriverCommand::TakeElementScreenshot(element)
},
Route::Status => WebDriverCommand::Status,
@ -347,7 +347,7 @@ impl <U: WebDriverExtensionRoute> WebDriverMessage<U> {
}
fn get_session_id(params: &Captures) -> Option<String> {
params.name("sessionId").map(|x| x.to_string())
params.name("sessionId").map(|x| x.as_str().into())
}
}