Преглед изворни кода

WebDriver: Implement `POST /session/{id}/element/{id}/element`

Tobias Christiansen пре 2 година
родитељ
комит
d26bbcab42

+ 14 - 0
Userland/Services/WebDriver/Client.cpp

@@ -34,6 +34,7 @@ Vector<Client::Route> Client::s_routes = {
     { HTTP::HttpRequest::Method::DELETE, { "session", ":session_id", "window" }, &Client::handle_close_window },
     { HTTP::HttpRequest::Method::POST, { "session", ":session_id", "element" }, &Client::handle_find_element },
     { HTTP::HttpRequest::Method::POST, { "session", ":session_id", "elements" }, &Client::handle_find_elements },
+    { HTTP::HttpRequest::Method::POST, { "session", ":session_id", "element", ":element_id", "element" }, &Client::handle_find_element_from_element },
     { HTTP::HttpRequest::Method::GET, { "session", ":session_id", "cookie" }, &Client::handle_get_all_cookies },
     { HTTP::HttpRequest::Method::GET, { "session", ":session_id", "cookie", ":name" }, &Client::handle_get_named_cookie },
     { HTTP::HttpRequest::Method::POST, { "session", ":session_id", "cookie" }, &Client::handle_add_cookie },
@@ -551,6 +552,19 @@ ErrorOr<JsonValue, HttpError> Client::handle_find_elements(Vector<StringView> co
     return make_json_value(result);
 }
 
+// 12.3.4 Find Element From Element, https://w3c.github.io/webdriver/#dfn-find-element-from-element
+// POST	/session/{session id}/element/{element id}/element
+ErrorOr<JsonValue, HttpError> Client::handle_find_element_from_element(Vector<StringView> const& parameters, JsonValue const& payload)
+{
+    dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session/<session_id>/element/<element_id>/element");
+    auto* session = TRY(find_session_with_id(parameters[0]));
+
+    // NOTE: Spec steps handled in Session::find_element_from_element().
+    auto result = TRY(session->find_element_from_element(payload, parameters[1]));
+
+    return make_json_value(result);
+}
+
 // 14.1 Get All Cookies, https://w3c.github.io/webdriver/#dfn-get-all-cookies
 // GET /session/{session id}/cookie
 ErrorOr<JsonValue, HttpError> Client::handle_get_all_cookies(Vector<StringView> const& parameters, JsonValue const&)

+ 1 - 0
Userland/Services/WebDriver/Client.h

@@ -59,6 +59,7 @@ private:
     ErrorOr<JsonValue, HttpError> handle_close_window(Vector<StringView> const&, JsonValue const& payload);
     ErrorOr<JsonValue, HttpError> handle_find_element(Vector<StringView> const&, JsonValue const& payload);
     ErrorOr<JsonValue, HttpError> handle_find_elements(Vector<StringView> const&, JsonValue const& payload);
+    ErrorOr<JsonValue, HttpError> handle_find_element_from_element(Vector<StringView> const&, JsonValue const& payload);
     ErrorOr<JsonValue, HttpError> handle_get_all_cookies(Vector<StringView> const&, JsonValue const& payload);
     ErrorOr<JsonValue, HttpError> handle_get_named_cookie(Vector<StringView> const&, JsonValue const& payload);
     ErrorOr<JsonValue, HttpError> handle_add_cookie(Vector<StringView> const&, JsonValue const& payload);

+ 58 - 0
Userland/Services/WebDriver/Session.cpp

@@ -466,6 +466,64 @@ ErrorOr<JsonValue, HttpError> Session::find_elements(JsonValue const& payload)
     return JsonValue(result);
 }
 
+// 12.3.4 Find Element From Element, https://w3c.github.io/webdriver/#dfn-find-element-from-element
+ErrorOr<JsonValue, HttpError> Session::find_element_from_element(JsonValue const& payload, StringView parameter_element_id)
+{
+    if (!payload.is_object())
+        return HttpError { 400, "invalid argument", "Payload is not a JSON object" };
+
+    auto const& properties = payload.as_object();
+    // 1. Let location strategy be the result of getting a property called "using".
+    if (!properties.has("using"sv))
+        return HttpError { 400, "invalid argument", "No property called 'using' present" };
+    auto const& maybe_location_strategy = properties.get("using"sv);
+    if (!maybe_location_strategy.is_string())
+        return HttpError { 400, "invalid argument", "Property 'using' is not a String" };
+
+    auto location_strategy = maybe_location_strategy.to_string();
+
+    // 2. If location strategy is not present as a keyword in the table of location strategies, return error with error code invalid argument.
+    if (!s_locator_strategies.first_matching([&](LocatorStrategy const& match) { return match.name == location_strategy; }).has_value())
+        return HttpError { 400, "invalid argument", "No valid location strategy" };
+
+    // 3. Let selector be the result of getting a property called "value".
+    // 4. If selector is undefined, return error with error code invalid argument.
+    if (!properties.has("value"sv))
+        return HttpError { 400, "invalid argument", "No property called 'value' present" };
+    auto const& maybe_selector = properties.get("value"sv);
+    if (!maybe_selector.is_string())
+        return HttpError { 400, "invalid argument", "Property 'value' is not a String" };
+
+    auto selector = maybe_selector.to_string();
+
+    // 5. If the current browsing context is no longer open, return error with error code no such window.
+    auto current_window = get_window_object();
+    if (!current_window.has_value())
+        return HttpError { 404, "no such window", "Window not found" };
+
+    // FIXME: 6. Handle any user prompts and return its value if it is an error.
+
+    // FIXME: 7. Let start node be the result of trying to get a known connected element with url variable element id.
+    // NOTE: The whole concept of "connected elements" is not implemented yet. See get_or_create_a_web_element_reference()
+    //       For now the element is only represented by its ID
+
+    auto maybe_element_id = parameter_element_id.to_int();
+    if (!maybe_element_id.has_value())
+        return HttpError { 400, "invalid argument", "Element ID is not an i32" };
+
+    auto element_id = maybe_element_id.release_value();
+    LocalElement start_node = { element_id };
+
+    // 8. Let result be the value of trying to Find with start node, location strategy, and selector.
+    auto result = TRY(find(start_node, location_strategy, selector));
+
+    // 9. If result is empty, return error with error code no such element. Otherwise, return the first element of result.
+    if (result.is_empty())
+        return HttpError { 404, "no such element", "the requested element does not exist" };
+
+    return JsonValue(result.at(0));
+}
+
 // https://w3c.github.io/webdriver/#dfn-serialized-cookie
 static JsonObject serialize_cookie(Web::Cookie::Cookie const& cookie)
 {

+ 1 - 0
Userland/Services/WebDriver/Session.h

@@ -45,6 +45,7 @@ public:
     ErrorOr<JsonValue, HttpError> get_title();
     ErrorOr<JsonValue, HttpError> find_element(JsonValue const& payload);
     ErrorOr<JsonValue, HttpError> find_elements(JsonValue const& payload);
+    ErrorOr<JsonValue, HttpError> find_element_from_element(JsonValue const& payload, StringView parameter_element_id);
     ErrorOr<void, Variant<HttpError, Error>> close_window();
     ErrorOr<JsonValue, HttpError> get_all_cookies();
     ErrorOr<JsonValue, HttpError> get_named_cookie(String const& name);