diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-06-23 19:44:59 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-23 19:44:59 -0400 |
commit | a2b195aff81d7945243947df5ab1a973baf5c91e (patch) | |
tree | b31191b8a0f42a66be7244f5dcff33afab751b66 /components/webdriver_server | |
parent | 223d6cd13c3d6be6216b123bd7ebe2a49d802fac (diff) | |
parent | 12877511db90b3e64e0f00bd79220a78e00b22a9 (diff) | |
download | servo-a2b195aff81d7945243947df5ab1a973baf5c91e.tar.gz servo-a2b195aff81d7945243947df5ab1a973baf5c91e.zip |
Auto merge of #23588 - georgeroman:implement_status_wd_command, r=ferjm
Implement Status WebDriver command
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
<!-- Either: -->
- [X] There are tests for these changes
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23588)
<!-- Reviewable:end -->
Diffstat (limited to 'components/webdriver_server')
-rw-r--r-- | components/webdriver_server/lib.rs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index c43699629f7..368bfb1e0ae 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -542,6 +542,17 @@ impl Handler { Ok(WebDriverResponse::DeleteSession) } + // https://w3c.github.io/webdriver/#status + fn handle_status(&self) -> WebDriverResult<WebDriverResponse> { + Ok(WebDriverResponse::Generic(ValueResponse( + if self.session.is_none() { + json!({ "ready": true, "message": "Ready for a new session" }) + } else { + json!({ "ready": false, "message": "Not ready for a new session" }) + }, + ))) + } + fn browsing_context_script_command( &self, cmd_msg: WebDriverScriptCommand, @@ -1426,7 +1437,7 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler { // Unless we are trying to create a new session, we need to ensure that a // session has previously been created match msg.command { - WebDriverCommand::NewSession(_) => {}, + WebDriverCommand::NewSession(_) | WebDriverCommand::Status => {}, _ => { self.session()?; }, @@ -1435,6 +1446,7 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler { match msg.command { WebDriverCommand::NewSession(ref parameters) => self.handle_new_session(parameters), WebDriverCommand::DeleteSession => self.handle_delete_session(), + WebDriverCommand::Status => self.handle_status(), WebDriverCommand::AddCookie(ref parameters) => self.handle_add_cookie(parameters), WebDriverCommand::Get(ref parameters) => self.handle_get(parameters), WebDriverCommand::GetCurrentUrl => self.handle_current_url(), |