diff --git a/Userland/Libraries/LibWeb/WebDriver/Client.cpp b/Userland/Libraries/LibWeb/WebDriver/Client.cpp index 7755a67280..9b28f7efe4 100644 --- a/Userland/Libraries/LibWeb/WebDriver/Client.cpp +++ b/Userland/Libraries/LibWeb/WebDriver/Client.cpp @@ -96,6 +96,7 @@ static constexpr auto s_webdriver_endpoints = Array { ROUTE(POST, "/session/:session_id/cookie"sv, add_cookie), ROUTE(DELETE, "/session/:session_id/cookie/:name"sv, delete_cookie), ROUTE(DELETE, "/session/:session_id/cookie"sv, delete_all_cookies), + ROUTE(DELETE, "/session/:session_id/actions"sv, release_actions), ROUTE(POST, "/session/:session_id/alert/dismiss"sv, dismiss_alert), ROUTE(POST, "/session/:session_id/alert/accept"sv, accept_alert), ROUTE(GET, "/session/:session_id/alert/text"sv, get_alert_text), diff --git a/Userland/Libraries/LibWeb/WebDriver/Client.h b/Userland/Libraries/LibWeb/WebDriver/Client.h index 4cb7eb9586..639938aa6e 100644 --- a/Userland/Libraries/LibWeb/WebDriver/Client.h +++ b/Userland/Libraries/LibWeb/WebDriver/Client.h @@ -92,6 +92,9 @@ public: virtual Response delete_cookie(Parameters parameters, JsonValue payload) = 0; virtual Response delete_all_cookies(Parameters parameters, JsonValue payload) = 0; + // 15. Actions, https://w3c.github.io/webdriver/#actions + virtual Response release_actions(Parameters parameters, JsonValue payload) = 0; + // 16. User prompts, https://w3c.github.io/webdriver/#user-prompts virtual Response dismiss_alert(Parameters parameters, JsonValue payload) = 0; virtual Response accept_alert(Parameters parameters, JsonValue payload) = 0; diff --git a/Userland/Services/WebContent/WebDriverClient.ipc b/Userland/Services/WebContent/WebDriverClient.ipc index 3a922d384d..c26fcb2edc 100644 --- a/Userland/Services/WebContent/WebDriverClient.ipc +++ b/Userland/Services/WebContent/WebDriverClient.ipc @@ -51,6 +51,7 @@ endpoint WebDriverClient { add_cookie(JsonValue payload) => (Web::WebDriver::Response response) delete_cookie(String name) => (Web::WebDriver::Response response) delete_all_cookies() => (Web::WebDriver::Response response) + release_actions() => (Web::WebDriver::Response response) dismiss_alert() => (Web::WebDriver::Response response) accept_alert() => (Web::WebDriver::Response response) get_alert_text() => (Web::WebDriver::Response response) diff --git a/Userland/Services/WebContent/WebDriverConnection.cpp b/Userland/Services/WebContent/WebDriverConnection.cpp index ead63a0038..7e4a62bd8e 100644 --- a/Userland/Services/WebContent/WebDriverConnection.cpp +++ b/Userland/Services/WebContent/WebDriverConnection.cpp @@ -1654,6 +1654,26 @@ Messages::WebDriverClient::DeleteAllCookiesResponse WebDriverConnection::delete_ return JsonValue {}; } +// 15.8 Release Actions, https://w3c.github.io/webdriver/#release-actions +Messages::WebDriverClient::ReleaseActionsResponse WebDriverConnection::release_actions() +{ + // 1. If the current browsing context is no longer open, return error with error code no such window. + TRY(ensure_open_top_level_browsing_context()); + + // FIXME: 2. Let input state be the result of get the input state with current session and current top-level browsing context. + + // FIXME: 3. Let actions options be a new actions options with the is element origin steps set to represents a web element, and the get element origin steps set to get a WebElement origin. + + // FIXME: 4. Let undo actions be input state’s input cancel list in reverse order. + + // FIXME: 5. Try to dispatch tick actions with arguments undo actions, 0, current browsing context, and actions options. + + // FIXME: 6. Reset the input state with current session and current top-level browsing context. + + // 7. Return success with data null. + return JsonValue {}; +} + // 16.1 Dismiss Alert, https://w3c.github.io/webdriver/#dismiss-alert Messages::WebDriverClient::DismissAlertResponse WebDriverConnection::dismiss_alert() { diff --git a/Userland/Services/WebContent/WebDriverConnection.h b/Userland/Services/WebContent/WebDriverConnection.h index 0012ee301b..6c46fd0df7 100644 --- a/Userland/Services/WebContent/WebDriverConnection.h +++ b/Userland/Services/WebContent/WebDriverConnection.h @@ -88,6 +88,7 @@ private: virtual Messages::WebDriverClient::AddCookieResponse add_cookie(JsonValue const& payload) override; virtual Messages::WebDriverClient::DeleteCookieResponse delete_cookie(String const& name) override; virtual Messages::WebDriverClient::DeleteAllCookiesResponse delete_all_cookies() override; + virtual Messages::WebDriverClient::ReleaseActionsResponse release_actions() override; virtual Messages::WebDriverClient::DismissAlertResponse dismiss_alert() override; virtual Messages::WebDriverClient::AcceptAlertResponse accept_alert() override; virtual Messages::WebDriverClient::GetAlertTextResponse get_alert_text() override; diff --git a/Userland/Services/WebDriver/Client.cpp b/Userland/Services/WebDriver/Client.cpp index 6d28c80875..74787b11c6 100644 --- a/Userland/Services/WebDriver/Client.cpp +++ b/Userland/Services/WebDriver/Client.cpp @@ -632,6 +632,15 @@ Web::WebDriver::Response Client::delete_all_cookies(Web::WebDriver::Parameters p return session->web_content_connection().delete_all_cookies(); } +// 15.8 Release Actions, https://w3c.github.io/webdriver/#release-actions +// DELETE /session/{session id}/actions +Web::WebDriver::Response Client::release_actions(Web::WebDriver::Parameters parameters, JsonValue) +{ + dbgln_if(WEBDRIVER_DEBUG, "Handling DELETE /session//actions"); + auto session = TRY(find_session_with_id(parameters[0])); + return session->web_content_connection().release_actions(); +} + // 16.1 Dismiss Alert, https://w3c.github.io/webdriver/#dismiss-alert // POST /session/{session id}/alert/dismiss Web::WebDriver::Response Client::dismiss_alert(Web::WebDriver::Parameters parameters, JsonValue) diff --git a/Userland/Services/WebDriver/Client.h b/Userland/Services/WebDriver/Client.h index 14061ccf55..c9fa8ab09b 100644 --- a/Userland/Services/WebDriver/Client.h +++ b/Userland/Services/WebDriver/Client.h @@ -85,6 +85,7 @@ private: virtual Web::WebDriver::Response add_cookie(Web::WebDriver::Parameters parameters, JsonValue payload) override; virtual Web::WebDriver::Response delete_cookie(Web::WebDriver::Parameters parameters, JsonValue payload) override; virtual Web::WebDriver::Response delete_all_cookies(Web::WebDriver::Parameters parameters, JsonValue payload) override; + virtual Web::WebDriver::Response release_actions(Web::WebDriver::Parameters parameters, JsonValue payload) override; virtual Web::WebDriver::Response dismiss_alert(Web::WebDriver::Parameters parameters, JsonValue payload) override; virtual Web::WebDriver::Response accept_alert(Web::WebDriver::Parameters parameters, JsonValue payload) override; virtual Web::WebDriver::Response get_alert_text(Web::WebDriver::Parameters parameters, JsonValue payload) override;