mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-27 20:58:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

WebDriver: Don't return from new_window() until WebDriver is connected

Browse source 
Previously, tests would intermittently fail because the current session
wasn't yet aware of a newly created window handle.

Co-authored-by: Timothy Flynn <trflynn89@pm.me>
This commit is contained in:
Tim Ledbetter 2024-10-21 14:42:23 +01:00 • committed by Tim Ledbetter
commit 74983e6966
Notes: github-actions[bot] 2024-10-21 17:03:15 +00:00
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Services/WebDriver/Client.cpp
View file

@ -11,6 +11,8 @@
#include <AK/Debug.h> #include <AK/Debug.h>
#include <AK/JsonObject.h> #include <AK/JsonObject.h>
#include <AK/JsonValue.h> #include <AK/JsonValue.h>
#include <LibCore/EventLoop.h>
#include <LibCore/Timer.h>
#include <LibWeb/WebDriver/Capabilities.h> #include <LibWeb/WebDriver/Capabilities.h>
#include <LibWeb/WebDriver/TimeoutsConfiguration.h> #include <LibWeb/WebDriver/TimeoutsConfiguration.h>
#include <WebDriver/Client.h> #include <WebDriver/Client.h>
@ -345,7 +347,21 @@ Web::WebDriver::Response Client::new_window(Web::WebDriver::Parameters parameter
{ {
dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session/<session_id>/window/new"); dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session/<session_id>/window/new");
auto session = TRY(find_session_with_id(parameters[0])); auto session = TRY(find_session_with_id(parameters[0]));
return session->web_content_connection().new_window(payload); auto handle = TRY(session->web_content_connection().new_window(payload));
constexpr u32 CONNECTION_TIMEOUT_MS = 5000;
auto timeout_fired = false;
auto timer = Core::Timer::create_single_shot(CONNECTION_TIMEOUT_MS, [&timeout_fired] { timeout_fired = true; });
timer->start();
Core::EventLoop::current().spin_until([&session, &timeout_fired, handle = handle.as_object().get("handle"sv)->as_string()]() {
return session->has_window_handle(handle) || timeout_fired;
});
if (timeout_fired)
return Web::WebDriver::Error::from_code(Web::WebDriver::ErrorCode::Timeout, "Timed out waiting for window handle");
return handle;
} }
// 11.6 Switch To Frame, https://w3c.github.io/webdriver/#dfn-switch-to-frame // 11.6 Switch To Frame, https://w3c.github.io/webdriver/#dfn-switch-to-frame

2
Userland/Services/WebDriver/Session.h
View file

@ -49,6 +49,8 @@ public:
return m_current_window_handle; return m_current_window_handle;
} }
bool has_window_handle(StringView handle) const { return m_windows.contains(handle); }
ErrorOr<void> start(LaunchBrowserCallbacks const&); ErrorOr<void> start(LaunchBrowserCallbacks const&);
Web::WebDriver::Response close_window(); Web::WebDriver::Response close_window();
Web::WebDriver::Response switch_to_window(StringView); Web::WebDriver::Response switch_to_window(StringView);