cargo, marionette: upgrade to webdriver 0.25.0

3 files changed, 11 insertions, 8 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 841a92a..262af92 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,7 +17,7 @@ dependencies = [
  "slog-stdlog 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-stream 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "webdriver 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webdriver 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "zip 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -642,7 +642,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "webdriver"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "backtrace 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -769,7 +769,7 @@ dependencies = [
 "checksum uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "78c590b5bd79ed10aad8fb75f078a59d8db445af6c743e55c4a53227fc01c13f"
 "checksum vec_map 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8cdc8b93bd0198ed872357fb2e667f7125646b1762f16d60b2c96350d361897"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum webdriver 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ec09fff6c7a59e9a8a4ad0439d5f308d769ddca29857170e101b1fc6735150f"
+"checksum webdriver 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b98779bcc114de9a87d6180d4e02d8d5212d0bf81cb777cdea0edcc7bcfeca11"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winreg 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e63857fb213f619b4c4fff86b158285c76766aac7e7474967e92fb6dbbfeefe9"
diff --git a/Cargo.toml b/Cargo.toml
index 8893d8d..4df2b24 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,5 +27,5 @@ slog-atomic = "0.4"
 slog-stdlog = "1"
 slog-stream = "1"
 uuid = "0.1.18"
-webdriver = "0.24"
+webdriver = "0.25"
 zip = "0.1"
diff --git a/src/marionette.rs b/src/marionette.rs
index b8737e7..a0b904c 100644
--- a/src/marionette.rs
+++ b/src/marionette.rs
@@ -782,11 +782,13 @@ impl MarionetteSession {
 
     pub fn error_from_string(&self, error_code: &str) -> ErrorStatus {
         match error_code {
+            "element click intercepted" => ErrorStatus::ElementClickIntercepted,
+            "element not interactable" | "element not visible" => ErrorStatus::ElementNotInteractable,
             "element not selectable" => ErrorStatus::ElementNotSelectable,
-            "element not visible" => ErrorStatus::ElementNotVisible,
+            "insecure certificate" => ErrorStatus::InsecureCertificate,
             "invalid argument" => ErrorStatus::InvalidArgument,
             "invalid cookie domain" => ErrorStatus::InvalidCookieDomain,
-            "invalid element coordinates" => ErrorStatus::InvalidElementCoordinates,
+            "invalid coordinates" | "invalid element coordinates" => ErrorStatus::InvalidCoordinates,
             "invalid element state" => ErrorStatus::InvalidElementState,
             "invalid selector" => ErrorStatus::InvalidSelector,
             "invalid session id" => ErrorStatus::InvalidSessionId,
@@ -800,12 +802,13 @@ impl MarionetteSession {
             "session not created" => ErrorStatus::SessionNotCreated,
             "stale element reference" => ErrorStatus::StaleElementReference,
             "timeout" => ErrorStatus::Timeout,
+            "unable to capture screen" => ErrorStatus::UnableToCaptureScreen,
             "unable to set cookie" => ErrorStatus::UnableToSetCookie,
             "unexpected alert open" => ErrorStatus::UnexpectedAlertOpen,
+            "unknown command" => ErrorStatus::UnknownCommand,
             "unknown error" => ErrorStatus::UnknownError,
-            "unknown command" => ErrorStatus::UnknownPath,
             "unsupported operation" => ErrorStatus::UnsupportedOperation,
-            _ => ErrorStatus::UnknownError
+            _ => ErrorStatus::UnknownError,
         }
     }
 }