Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the timeout logic in the waitForEvent integration test helper function #18325

Merged
merged 1 commit into from
Jun 25, 2024
Merged

Fix the timeout logic in the waitForEvent integration test helper function #18325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions test/integration/test_utils.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,16 +189,22 @@ async function getSpanRectFromText(page, pageNumber, text) {
async function waitForEvent(page, eventName, timeout = 5000) {
const handle = await page.evaluateHandle(
(name, timeOut) => {
let callback = null;
let callback = null,
timeoutId = null;
return [
Promise.race([
new Promise(resolve => {
// add event listener and wait for event to fire before returning
callback = () => resolve(false);
callback = () => {
if (timeoutId) {
clearTimeout(timeoutId);
}
resolve(false);
};
document.addEventListener(name, callback, { once: true });
}),
new Promise(resolve => {
setTimeout(() => {
timeoutId = setTimeout(() => {
document.removeEventListener(name, callback);
resolve(true);
}, timeOut);
Expand Down