From cb91e6067cb1e527e81a432007172c1962b3a160 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Mon, 14 Nov 2022 19:02:23 -0500 Subject: [PATCH] LibWeb+WebContent+WebDriver: Implement Get Active Element Unfortunately, nothing ever calls DOM::Document::set_active_element at the moment, so this will always return ErrorCode::NoSuchElement. --- .../Libraries/LibWeb/WebDriver/Client.cpp | 1 + Userland/Libraries/LibWeb/WebDriver/Client.h | 1 + .../Services/WebContent/WebDriverClient.ipc | 1 + .../WebContent/WebDriverConnection.cpp | 19 +++++++++++++++++++ .../Services/WebContent/WebDriverConnection.h | 1 + Userland/Services/WebDriver/Client.cpp | 9 +++++++++ Userland/Services/WebDriver/Client.h | 1 + 7 files changed, 33 insertions(+) diff --git a/Userland/Libraries/LibWeb/WebDriver/Client.cpp b/Userland/Libraries/LibWeb/WebDriver/Client.cpp index 33b582a3ea..99bed95673 100644 --- a/Userland/Libraries/LibWeb/WebDriver/Client.cpp +++ b/Userland/Libraries/LibWeb/WebDriver/Client.cpp @@ -73,6 +73,7 @@ static constexpr auto s_webdriver_endpoints = Array { ROUTE(POST, "/session/:session_id/elements"sv, find_elements), ROUTE(POST, "/session/:session_id/element/:element_id/element"sv, find_element_from_element), ROUTE(POST, "/session/:session_id/element/:element_id/elements"sv, find_elements_from_element), + ROUTE(GET, "/session/:session_id/element/active"sv, get_active_element), ROUTE(GET, "/session/:session_id/element/:element_id/selected"sv, is_element_selected), ROUTE(GET, "/session/:session_id/element/:element_id/attribute/:name"sv, get_element_attribute), ROUTE(GET, "/session/:session_id/element/:element_id/property/:name"sv, get_element_property), diff --git a/Userland/Libraries/LibWeb/WebDriver/Client.h b/Userland/Libraries/LibWeb/WebDriver/Client.h index 91580aa632..bf00176930 100644 --- a/Userland/Libraries/LibWeb/WebDriver/Client.h +++ b/Userland/Libraries/LibWeb/WebDriver/Client.h @@ -61,6 +61,7 @@ public: virtual Response find_elements(Parameters parameters, JsonValue payload) = 0; virtual Response find_element_from_element(Parameters parameters, JsonValue payload) = 0; virtual Response find_elements_from_element(Parameters parameters, JsonValue payload) = 0; + virtual Response get_active_element(Parameters parameters, JsonValue payload) = 0; virtual Response is_element_selected(Parameters parameters, JsonValue payload) = 0; virtual Response get_element_attribute(Parameters parameters, JsonValue payload) = 0; virtual Response get_element_property(Parameters parameters, JsonValue payload) = 0; diff --git a/Userland/Services/WebContent/WebDriverClient.ipc b/Userland/Services/WebContent/WebDriverClient.ipc index c0922a3095..5ec325042b 100644 --- a/Userland/Services/WebContent/WebDriverClient.ipc +++ b/Userland/Services/WebContent/WebDriverClient.ipc @@ -23,6 +23,7 @@ endpoint WebDriverClient { find_elements(JsonValue payload) => (Web::WebDriver::Response response) find_element_from_element(JsonValue payload, String element_id) => (Web::WebDriver::Response response) find_elements_from_element(JsonValue payload, String element_id) => (Web::WebDriver::Response response) + get_active_element() => (Web::WebDriver::Response response) is_element_selected(String element_id) => (Web::WebDriver::Response response) get_element_attribute(String element_id, String name) => (Web::WebDriver::Response response) get_element_property(String element_id, String name) => (Web::WebDriver::Response response) diff --git a/Userland/Services/WebContent/WebDriverConnection.cpp b/Userland/Services/WebContent/WebDriverConnection.cpp index 932d7434ca..c8ee9a66c4 100644 --- a/Userland/Services/WebContent/WebDriverConnection.cpp +++ b/Userland/Services/WebContent/WebDriverConnection.cpp @@ -705,6 +705,25 @@ Messages::WebDriverClient::FindElementsFromElementResponse WebDriverConnection:: return TRY(find(*start_node, *location_strategy, selector)); } +// 12.3.8 Get Active Element, https://w3c.github.io/webdriver/#get-active-element +Messages::WebDriverClient::GetActiveElementResponse WebDriverConnection::get_active_element() +{ + // 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. Handle any user prompts and return its value if it is an error. + + // 3. Let active element be the active element of the current browsing context’s document element. + auto* active_element = m_page_host.page().top_level_browsing_context().active_document()->active_element(); + + // 4. If active element is a non-null element, return success with data set to web element reference object for active element. + // Otherwise, return error with error code no such element. + if (active_element) + return String::number(active_element->id()); + + return Web::WebDriver::Error::from_code(Web::WebDriver::ErrorCode::NoSuchElement, "The current document does not have an active element"sv); +} + // 12.4.1 Is Element Selected, https://w3c.github.io/webdriver/#dfn-is-element-selected Messages::WebDriverClient::IsElementSelectedResponse WebDriverConnection::is_element_selected(String const& element_id) { diff --git a/Userland/Services/WebContent/WebDriverConnection.h b/Userland/Services/WebContent/WebDriverConnection.h index 64e4e2bd87..712c7c5141 100644 --- a/Userland/Services/WebContent/WebDriverConnection.h +++ b/Userland/Services/WebContent/WebDriverConnection.h @@ -58,6 +58,7 @@ private: virtual Messages::WebDriverClient::FindElementsResponse find_elements(JsonValue const& payload) override; virtual Messages::WebDriverClient::FindElementFromElementResponse find_element_from_element(JsonValue const& payload, String const& element_id) override; virtual Messages::WebDriverClient::FindElementsFromElementResponse find_elements_from_element(JsonValue const& payload, String const& element_id) override; + virtual Messages::WebDriverClient::GetActiveElementResponse get_active_element() override; virtual Messages::WebDriverClient::IsElementSelectedResponse is_element_selected(String const& element_id) override; virtual Messages::WebDriverClient::GetElementAttributeResponse get_element_attribute(String const& element_id, String const& name) override; virtual Messages::WebDriverClient::GetElementPropertyResponse get_element_property(String const& element_id, String const& name) override; diff --git a/Userland/Services/WebDriver/Client.cpp b/Userland/Services/WebDriver/Client.cpp index 3d4810eb0c..4addb5603c 100644 --- a/Userland/Services/WebDriver/Client.cpp +++ b/Userland/Services/WebDriver/Client.cpp @@ -359,6 +359,15 @@ Web::WebDriver::Response Client::find_elements_from_element(Web::WebDriver::Para return session->web_content_connection().find_elements_from_element(payload, parameters[1]); } +// 12.3.8 Get Active Element, https://w3c.github.io/webdriver/#get-active-element +// GET /session/{session id}/element/active +Web::WebDriver::Response Client::get_active_element(Web::WebDriver::Parameters parameters, JsonValue) +{ + dbgln_if(WEBDRIVER_DEBUG, "Handling GET /session//element/active"); + auto* session = TRY(find_session_with_id(parameters[0])); + return session->web_content_connection().get_active_element(); +} + // 12.4.1 Is Element Selected, https://w3c.github.io/webdriver/#dfn-is-element-selected // GET /session/{session id}/element/{element id}/selected Web::WebDriver::Response Client::is_element_selected(Web::WebDriver::Parameters parameters, JsonValue) diff --git a/Userland/Services/WebDriver/Client.h b/Userland/Services/WebDriver/Client.h index 91232641ee..440af902a3 100644 --- a/Userland/Services/WebDriver/Client.h +++ b/Userland/Services/WebDriver/Client.h @@ -56,6 +56,7 @@ private: virtual Web::WebDriver::Response find_elements(Web::WebDriver::Parameters parameters, JsonValue payload) override; virtual Web::WebDriver::Response find_element_from_element(Web::WebDriver::Parameters parameters, JsonValue payload) override; virtual Web::WebDriver::Response find_elements_from_element(Web::WebDriver::Parameters parameters, JsonValue payload) override; + virtual Web::WebDriver::Response get_active_element(Web::WebDriver::Parameters parameters, JsonValue payload) override; virtual Web::WebDriver::Response is_element_selected(Web::WebDriver::Parameters parameters, JsonValue payload) override; virtual Web::WebDriver::Response get_element_attribute(Web::WebDriver::Parameters parameters, JsonValue payload) override; virtual Web::WebDriver::Response get_element_property(Web::WebDriver::Parameters parameters, JsonValue payload) override;