mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 21:57:35 +00:00
Browser+WebContent+WebDriver: Move Get Element Text to WebContent
This commit is contained in:
parent
06f1b8825c
commit
5d32fd7026
16 changed files with 22 additions and 62 deletions
|
@ -611,10 +611,6 @@ void BrowserWindow::create_new_tab(URL url, bool activate)
|
||||||
active_tab().view().scroll_element_into_view(element_id);
|
active_tab().view().scroll_element_into_view(element_id);
|
||||||
};
|
};
|
||||||
|
|
||||||
new_tab.webdriver_endpoints().on_get_element_text = [this](i32 element_id) {
|
|
||||||
return active_tab().view().get_element_text(element_id);
|
|
||||||
};
|
|
||||||
|
|
||||||
new_tab.webdriver_endpoints().on_get_element_tag_name = [this](i32 element_id) {
|
new_tab.webdriver_endpoints().on_get_element_tag_name = [this](i32 element_id) {
|
||||||
return active_tab().view().get_element_tag_name(element_id);
|
return active_tab().view().get_element_tag_name(element_id);
|
||||||
};
|
};
|
||||||
|
|
|
@ -146,17 +146,6 @@ void WebDriverConnection::scroll_element_into_view(i32 element_id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Messages::WebDriverSessionClient::GetElementTextResponse WebDriverConnection::get_element_text(i32 element_id)
|
|
||||||
{
|
|
||||||
dbgln_if(WEBDRIVER_DEBUG, "WebDriverConnection: get_element_text");
|
|
||||||
if (auto browser_window = m_browser_window.strong_ref()) {
|
|
||||||
auto& tab = browser_window->active_tab();
|
|
||||||
if (tab.webdriver_endpoints().on_get_element_text)
|
|
||||||
return { tab.webdriver_endpoints().on_get_element_text(element_id) };
|
|
||||||
}
|
|
||||||
return { "" };
|
|
||||||
}
|
|
||||||
|
|
||||||
Messages::WebDriverSessionClient::GetElementTagNameResponse WebDriverConnection::get_element_tag_name(i32 element_id)
|
Messages::WebDriverSessionClient::GetElementTagNameResponse WebDriverConnection::get_element_tag_name(i32 element_id)
|
||||||
{
|
{
|
||||||
dbgln("WebDriverConnection: get_computed_value_for_element");
|
dbgln("WebDriverConnection: get_computed_value_for_element");
|
||||||
|
|
|
@ -49,7 +49,6 @@ public:
|
||||||
virtual void add_cookie(Web::Cookie::ParsedCookie const&) override;
|
virtual void add_cookie(Web::Cookie::ParsedCookie const&) override;
|
||||||
virtual void update_cookie(Web::Cookie::Cookie const&) override;
|
virtual void update_cookie(Web::Cookie::Cookie const&) override;
|
||||||
virtual void scroll_element_into_view(i32 element_id) override;
|
virtual void scroll_element_into_view(i32 element_id) override;
|
||||||
virtual Messages::WebDriverSessionClient::GetElementTextResponse get_element_text(i32 element_id) override;
|
|
||||||
virtual Messages::WebDriverSessionClient::GetElementTagNameResponse get_element_tag_name(i32 element_id) override;
|
virtual Messages::WebDriverSessionClient::GetElementTagNameResponse get_element_tag_name(i32 element_id) override;
|
||||||
virtual Messages::WebDriverSessionClient::GetElementRectResponse get_element_rect(i32 element_id) override;
|
virtual Messages::WebDriverSessionClient::GetElementRectResponse get_element_rect(i32 element_id) override;
|
||||||
virtual Messages::WebDriverSessionClient::IsElementEnabledResponse is_element_enabled(i32 element_id) override;
|
virtual Messages::WebDriverSessionClient::IsElementEnabledResponse is_element_enabled(i32 element_id) override;
|
||||||
|
|
|
@ -24,7 +24,6 @@ public:
|
||||||
~WebDriverEndpoints() = default;
|
~WebDriverEndpoints() = default;
|
||||||
|
|
||||||
Function<void(i32 element_id)> on_scroll_element_into_view;
|
Function<void(i32 element_id)> on_scroll_element_into_view;
|
||||||
Function<String(i32 element_id)> on_get_element_text;
|
|
||||||
Function<String(i32 element_id)> on_get_element_tag_name;
|
Function<String(i32 element_id)> on_get_element_tag_name;
|
||||||
Function<Gfx::IntRect(i32 element_id)> on_get_element_rect;
|
Function<Gfx::IntRect(i32 element_id)> on_get_element_rect;
|
||||||
Function<bool(i32 element_id)> on_is_element_enabled;
|
Function<bool(i32 element_id)> on_is_element_enabled;
|
||||||
|
|
|
@ -25,7 +25,6 @@ endpoint WebDriverSessionClient {
|
||||||
add_cookie(Web::Cookie::ParsedCookie cookie) =|
|
add_cookie(Web::Cookie::ParsedCookie cookie) =|
|
||||||
update_cookie(Web::Cookie::Cookie cookie) =|
|
update_cookie(Web::Cookie::Cookie cookie) =|
|
||||||
scroll_element_into_view(i32 element_id) => ()
|
scroll_element_into_view(i32 element_id) => ()
|
||||||
get_element_text(i32 element_id) => (String text)
|
|
||||||
get_element_tag_name(i32 element_id) => (String tag_name)
|
get_element_tag_name(i32 element_id) => (String tag_name)
|
||||||
get_element_rect(i32 element_id) => (Gfx::IntRect rect)
|
get_element_rect(i32 element_id) => (Gfx::IntRect rect)
|
||||||
is_element_enabled(i32 element_id) => (bool enabled)
|
is_element_enabled(i32 element_id) => (bool enabled)
|
||||||
|
|
|
@ -559,11 +559,6 @@ void OutOfProcessWebView::scroll_element_into_view(i32 element_id)
|
||||||
return client().scroll_element_into_view(element_id);
|
return client().scroll_element_into_view(element_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
String OutOfProcessWebView::get_element_text(i32 element_id)
|
|
||||||
{
|
|
||||||
return client().get_element_text(element_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
String OutOfProcessWebView::get_element_tag_name(i32 element_id)
|
String OutOfProcessWebView::get_element_tag_name(i32 element_id)
|
||||||
{
|
{
|
||||||
return client().get_element_tag_name(element_id);
|
return client().get_element_tag_name(element_id);
|
||||||
|
|
|
@ -64,7 +64,6 @@ public:
|
||||||
OrderedHashMap<String, String> get_session_storage_entries();
|
OrderedHashMap<String, String> get_session_storage_entries();
|
||||||
|
|
||||||
void scroll_element_into_view(i32 element_id);
|
void scroll_element_into_view(i32 element_id);
|
||||||
String get_element_text(i32 element_id);
|
|
||||||
String get_element_tag_name(i32 element_id);
|
String get_element_tag_name(i32 element_id);
|
||||||
Gfx::IntRect get_element_rect(i32 element_id);
|
Gfx::IntRect get_element_rect(i32 element_id);
|
||||||
bool is_element_enabled(i32 element_id);
|
bool is_element_enabled(i32 element_id);
|
||||||
|
|
|
@ -494,15 +494,6 @@ void ConnectionFromClient::scroll_element_into_view(i32 element_id)
|
||||||
element->scroll_into_view(options);
|
element->scroll_into_view(options);
|
||||||
}
|
}
|
||||||
|
|
||||||
Messages::WebContentServer::GetElementTextResponse ConnectionFromClient::get_element_text(i32 element_id)
|
|
||||||
{
|
|
||||||
auto element = find_element_by_id(element_id);
|
|
||||||
if (!element.has_value())
|
|
||||||
return { "" };
|
|
||||||
|
|
||||||
return { element->layout_node()->dom_node()->text_content() };
|
|
||||||
}
|
|
||||||
|
|
||||||
Messages::WebContentServer::GetElementTagNameResponse ConnectionFromClient::get_element_tag_name(i32 element_id)
|
Messages::WebContentServer::GetElementTagNameResponse ConnectionFromClient::get_element_tag_name(i32 element_id)
|
||||||
{
|
{
|
||||||
auto element = find_element_by_id(element_id);
|
auto element = find_element_by_id(element_id);
|
||||||
|
|
|
@ -84,7 +84,6 @@ private:
|
||||||
virtual void js_console_request_messages(i32) override;
|
virtual void js_console_request_messages(i32) override;
|
||||||
|
|
||||||
virtual void scroll_element_into_view(i32 element_id) override;
|
virtual void scroll_element_into_view(i32 element_id) override;
|
||||||
virtual Messages::WebContentServer::GetElementTextResponse get_element_text(i32 element_id) override;
|
|
||||||
virtual Messages::WebContentServer::GetElementTagNameResponse get_element_tag_name(i32 element_id) override;
|
virtual Messages::WebContentServer::GetElementTagNameResponse get_element_tag_name(i32 element_id) override;
|
||||||
virtual Messages::WebContentServer::GetElementRectResponse get_element_rect(i32 element_id) override;
|
virtual Messages::WebContentServer::GetElementRectResponse get_element_rect(i32 element_id) override;
|
||||||
virtual Messages::WebContentServer::IsElementEnabledResponse is_element_enabled(i32 element_id) override;
|
virtual Messages::WebContentServer::IsElementEnabledResponse is_element_enabled(i32 element_id) override;
|
||||||
|
|
|
@ -43,7 +43,6 @@ endpoint WebContentServer
|
||||||
js_console_request_messages(i32 start_index) =|
|
js_console_request_messages(i32 start_index) =|
|
||||||
|
|
||||||
scroll_element_into_view(i32 element_id) => ()
|
scroll_element_into_view(i32 element_id) => ()
|
||||||
get_element_text(i32 element_id) => (String text)
|
|
||||||
get_element_tag_name(i32 element_id) => (String tag_name)
|
get_element_tag_name(i32 element_id) => (String tag_name)
|
||||||
get_element_rect(i32 element_id) => (Gfx::IntRect rect)
|
get_element_rect(i32 element_id) => (Gfx::IntRect rect)
|
||||||
is_element_enabled(i32 element_id) => (bool enabled)
|
is_element_enabled(i32 element_id) => (bool enabled)
|
||||||
|
|
|
@ -17,4 +17,5 @@ endpoint WebDriverClient {
|
||||||
get_element_attribute(String element_id, String name) => (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)
|
get_element_property(String element_id, String name) => (Web::WebDriver::Response response)
|
||||||
get_element_css_value(String element_id, String name) => (Web::WebDriver::Response response)
|
get_element_css_value(String element_id, String name) => (Web::WebDriver::Response response)
|
||||||
|
get_element_text(String element_id) => (Web::WebDriver::Response response)
|
||||||
}
|
}
|
||||||
|
|
|
@ -590,6 +590,24 @@ Messages::WebDriverClient::GetElementCssValueResponse WebDriverConnection::get_e
|
||||||
return make_success_response(move(computed_value));
|
return make_success_response(move(computed_value));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 12.4.5 Get Element Text, https://w3c.github.io/webdriver/#dfn-get-element-text
|
||||||
|
Messages::WebDriverClient::GetElementTextResponse WebDriverConnection::get_element_text(String const& element_id)
|
||||||
|
{
|
||||||
|
// 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 element be the result of trying to get a known connected element with url variable element id.
|
||||||
|
auto* element = TRY(get_known_connected_element(element_id));
|
||||||
|
|
||||||
|
// 4. Let rendered text be the result of performing implementation-specific steps whose result is exactly the same as the result of a Function.[[Call]](null, element) with bot.dom.getVisibleText as the this value.
|
||||||
|
auto rendered_text = element->text_content();
|
||||||
|
|
||||||
|
// 5. Return success with data rendered text.
|
||||||
|
return make_success_response(move(rendered_text));
|
||||||
|
}
|
||||||
|
|
||||||
// https://w3c.github.io/webdriver/#dfn-no-longer-open
|
// https://w3c.github.io/webdriver/#dfn-no-longer-open
|
||||||
ErrorOr<void, Web::WebDriver::Error> WebDriverConnection::ensure_open_top_level_browsing_context()
|
ErrorOr<void, Web::WebDriver::Error> WebDriverConnection::ensure_open_top_level_browsing_context()
|
||||||
{
|
{
|
||||||
|
|
|
@ -47,6 +47,7 @@ private:
|
||||||
virtual Messages::WebDriverClient::GetElementAttributeResponse get_element_attribute(String const& element_id, String const& name) 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;
|
virtual Messages::WebDriverClient::GetElementPropertyResponse get_element_property(String const& element_id, String const& name) override;
|
||||||
virtual Messages::WebDriverClient::GetElementCssValueResponse get_element_css_value(String const& element_id, String const& name) override;
|
virtual Messages::WebDriverClient::GetElementCssValueResponse get_element_css_value(String const& element_id, String const& name) override;
|
||||||
|
virtual Messages::WebDriverClient::GetElementTextResponse get_element_text(String const& element_id) override;
|
||||||
|
|
||||||
ErrorOr<void, Web::WebDriver::Error> ensure_open_top_level_browsing_context();
|
ErrorOr<void, Web::WebDriver::Error> ensure_open_top_level_browsing_context();
|
||||||
void restore_the_window();
|
void restore_the_window();
|
||||||
|
|
|
@ -686,12 +686,11 @@ Web::WebDriver::Response Client::handle_get_element_css_value(Vector<StringView>
|
||||||
|
|
||||||
// 12.4.5 Get Element Text, https://w3c.github.io/webdriver/#dfn-get-element-text
|
// 12.4.5 Get Element Text, https://w3c.github.io/webdriver/#dfn-get-element-text
|
||||||
// GET /session/{session id}/element/{element id}/text
|
// GET /session/{session id}/element/{element id}/text
|
||||||
Web::WebDriver::Response Client::handle_get_element_text(Vector<StringView> const& parameters, JsonValue const& payload)
|
Web::WebDriver::Response Client::handle_get_element_text(Vector<StringView> const& parameters, JsonValue const&)
|
||||||
{
|
{
|
||||||
dbgln_if(WEBDRIVER_DEBUG, "Handling GET /session/<session_id>/element/<element_id>/text");
|
dbgln_if(WEBDRIVER_DEBUG, "Handling GET /session/<session_id>/element/<element_id>/text");
|
||||||
auto* session = TRY(find_session_with_id(parameters[0]));
|
auto* session = TRY(find_session_with_id(parameters[0]));
|
||||||
auto result = TRY(session->get_element_text(payload, parameters[1]));
|
return session->web_content_connection().get_element_text(parameters[1]);
|
||||||
return make_json_value(result);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 12.4.6 Get Element Tag Name, https://w3c.github.io/webdriver/#dfn-get-element-tag-name
|
// 12.4.6 Get Element Tag Name, https://w3c.github.io/webdriver/#dfn-get-element-tag-name
|
||||||
|
|
|
@ -323,29 +323,6 @@ static ErrorOr<i32, Web::WebDriver::Error> get_known_connected_element(StringVie
|
||||||
return maybe_element_id.release_value();
|
return maybe_element_id.release_value();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 12.4.5 Get Element Text, https://w3c.github.io/webdriver/#dfn-get-element-text
|
|
||||||
Web::WebDriver::Response Session::get_element_text(JsonValue const&, StringView parameter_element_id)
|
|
||||||
{
|
|
||||||
// 1. If the current browsing context is no longer open, return error with error code no such window.
|
|
||||||
TRY(check_for_open_top_level_browsing_context_or_return_error());
|
|
||||||
|
|
||||||
// FIXME: 2. Handle any user prompts and return its value if it is an error.
|
|
||||||
|
|
||||||
// FIXME: 3. Let element be the result of trying to get a known connected element with url variable element id.
|
|
||||||
auto maybe_element_id = parameter_element_id.to_int();
|
|
||||||
if (!maybe_element_id.has_value())
|
|
||||||
return Web::WebDriver::Error::from_code(Web::WebDriver::ErrorCode::InvalidArgument, "Element ID is not an i32");
|
|
||||||
|
|
||||||
auto element_id = maybe_element_id.release_value();
|
|
||||||
|
|
||||||
// 4. Let rendered text be the result of performing implementation-specific steps whose result is exactly the
|
|
||||||
// same as the result of a Function.[[Call]](null, element) with bot.dom.getVisibleText as the this value.
|
|
||||||
auto rendered_text = m_browser_connection->get_element_text(element_id);
|
|
||||||
|
|
||||||
// 5. Return success with data rendered text.
|
|
||||||
return JsonValue(rendered_text);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 12.4.6 Get Element Tag Name, https://w3c.github.io/webdriver/#dfn-get-element-tag-name
|
// 12.4.6 Get Element Tag Name, https://w3c.github.io/webdriver/#dfn-get-element-tag-name
|
||||||
Web::WebDriver::Response Session::get_element_tag_name(JsonValue const&, StringView parameter_element_id)
|
Web::WebDriver::Response Session::get_element_tag_name(JsonValue const&, StringView parameter_element_id)
|
||||||
{
|
{
|
||||||
|
|
|
@ -58,7 +58,6 @@ public:
|
||||||
Web::WebDriver::Response get_window_handle();
|
Web::WebDriver::Response get_window_handle();
|
||||||
ErrorOr<void, Variant<Web::WebDriver::Error, Error>> close_window();
|
ErrorOr<void, Variant<Web::WebDriver::Error, Error>> close_window();
|
||||||
Web::WebDriver::Response get_window_handles() const;
|
Web::WebDriver::Response get_window_handles() const;
|
||||||
Web::WebDriver::Response get_element_text(JsonValue const& payload, StringView element_id);
|
|
||||||
Web::WebDriver::Response get_element_tag_name(JsonValue const& payload, StringView element_id);
|
Web::WebDriver::Response get_element_tag_name(JsonValue const& payload, StringView element_id);
|
||||||
Web::WebDriver::Response get_element_rect(StringView element_id);
|
Web::WebDriver::Response get_element_rect(StringView element_id);
|
||||||
Web::WebDriver::Response is_element_enabled(StringView element_id);
|
Web::WebDriver::Response is_element_enabled(StringView element_id);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue