mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 21:27:35 +00:00
LibWeb+WebContent+WebDriver: Implement Accept Alert
This commit is contained in:
parent
7cf2feb047
commit
3e7d633954
9 changed files with 45 additions and 0 deletions
|
@ -94,6 +94,7 @@ static constexpr auto s_webdriver_endpoints = Array {
|
|||
ROUTE(DELETE, "/session/:session_id/cookie/:name"sv, delete_cookie),
|
||||
ROUTE(DELETE, "/session/:session_id/cookie"sv, delete_all_cookies),
|
||||
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/screenshot"sv, take_screenshot),
|
||||
ROUTE(GET, "/session/:session_id/element/:element_id/screenshot"sv, take_element_screenshot),
|
||||
};
|
||||
|
|
|
@ -88,6 +88,7 @@ public:
|
|||
|
||||
// 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;
|
||||
|
||||
// 17. Screen capture, https://w3c.github.io/webdriver/#screen-capture
|
||||
virtual Response take_screenshot(Parameters parameters, JsonValue payload) = 0;
|
||||
|
|
|
@ -320,6 +320,19 @@ void PageHost::dismiss_dialog()
|
|||
}
|
||||
}
|
||||
|
||||
void PageHost::accept_dialog()
|
||||
{
|
||||
switch (m_pending_dialog) {
|
||||
case PendingDialog::None:
|
||||
break;
|
||||
case PendingDialog::Alert:
|
||||
case PendingDialog::Confirm:
|
||||
case PendingDialog::Prompt:
|
||||
m_client.async_did_request_accept_dialog();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void PageHost::page_did_change_favicon(Gfx::Bitmap const& favicon)
|
||||
{
|
||||
m_client.async_did_change_favicon(favicon.to_shareable_bitmap());
|
||||
|
|
|
@ -56,6 +56,7 @@ public:
|
|||
bool has_pending_dialog() const { return m_pending_dialog != PendingDialog::None; }
|
||||
PendingDialog pending_dialog() const { return m_pending_dialog; }
|
||||
void dismiss_dialog();
|
||||
void accept_dialog();
|
||||
|
||||
private:
|
||||
// ^PageClient
|
||||
|
|
|
@ -44,6 +44,7 @@ endpoint WebDriverClient {
|
|||
delete_cookie(String name) => (Web::WebDriver::Response response)
|
||||
delete_all_cookies() => (Web::WebDriver::Response response)
|
||||
dismiss_alert() => (Web::WebDriver::Response response)
|
||||
accept_alert() => (Web::WebDriver::Response response)
|
||||
take_screenshot() => (Web::WebDriver::Response response)
|
||||
take_element_screenshot(String element_id) => (Web::WebDriver::Response response)
|
||||
}
|
||||
|
|
|
@ -1360,6 +1360,23 @@ Messages::WebDriverClient::DismissAlertResponse WebDriverConnection::dismiss_ale
|
|||
return JsonValue {};
|
||||
}
|
||||
|
||||
// 16.2 Accept Alert, https://w3c.github.io/webdriver/#accept-alert
|
||||
Messages::WebDriverClient::AcceptAlertResponse WebDriverConnection::accept_alert()
|
||||
{
|
||||
// 1. If the current top-level browsing context is no longer open, return error with error code no such window.
|
||||
TRY(ensure_open_top_level_browsing_context());
|
||||
|
||||
// 2. If there is no current user prompt, return error with error code no such alert.
|
||||
if (!m_page_host.has_pending_dialog())
|
||||
return Web::WebDriver::Error::from_code(Web::WebDriver::ErrorCode::NoSuchAlert, "No user dialog is currently open"sv);
|
||||
|
||||
// 3. Accept the current user prompt.
|
||||
m_page_host.accept_dialog();
|
||||
|
||||
// 4. Return success with data null.
|
||||
return JsonValue {};
|
||||
}
|
||||
|
||||
// 17.1 Take Screenshot, https://w3c.github.io/webdriver/#take-screenshot
|
||||
Messages::WebDriverClient::TakeScreenshotResponse WebDriverConnection::take_screenshot()
|
||||
{
|
||||
|
|
|
@ -79,6 +79,7 @@ private:
|
|||
virtual Messages::WebDriverClient::DeleteCookieResponse delete_cookie(String const& name) override;
|
||||
virtual Messages::WebDriverClient::DeleteAllCookiesResponse delete_all_cookies() override;
|
||||
virtual Messages::WebDriverClient::DismissAlertResponse dismiss_alert() override;
|
||||
virtual Messages::WebDriverClient::AcceptAlertResponse accept_alert() override;
|
||||
virtual Messages::WebDriverClient::TakeScreenshotResponse take_screenshot() override;
|
||||
virtual Messages::WebDriverClient::TakeElementScreenshotResponse take_element_screenshot(String const& element_id) override;
|
||||
|
||||
|
|
|
@ -548,6 +548,15 @@ Web::WebDriver::Response Client::dismiss_alert(Web::WebDriver::Parameters parame
|
|||
return session->web_content_connection().dismiss_alert();
|
||||
}
|
||||
|
||||
// 16.2 Accept Alert, https://w3c.github.io/webdriver/#accept-alert
|
||||
// POST /session/{session id}/alert/accept
|
||||
Web::WebDriver::Response Client::accept_alert(Web::WebDriver::Parameters parameters, JsonValue)
|
||||
{
|
||||
dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session/<session_id>/alert/accept");
|
||||
auto* session = TRY(find_session_with_id(parameters[0]));
|
||||
return session->web_content_connection().accept_alert();
|
||||
}
|
||||
|
||||
// 17.1 Take Screenshot, https://w3c.github.io/webdriver/#take-screenshot
|
||||
// GET /session/{session id}/screenshot
|
||||
Web::WebDriver::Response Client::take_screenshot(Web::WebDriver::Parameters parameters, JsonValue)
|
||||
|
|
|
@ -77,6 +77,7 @@ private:
|
|||
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 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 take_screenshot(Web::WebDriver::Parameters parameters, JsonValue payload) override;
|
||||
virtual Web::WebDriver::Response take_element_screenshot(Web::WebDriver::Parameters parameters, JsonValue payload) override;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue