Skip to content

fix(e2e-tests): close the focus-mode modal COMPASS-8820 #6615

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

Merged
merged 4 commits into from
Jan 16, 2025
Merged

fix(e2e-tests): close the focus-mode modal COMPASS-8820 #6615

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80185d5
close the modal
mabaasit Jan 14, 2025
97fd4c0
close modal using close button
mabaasit Jan 15, 2025
e0ffd57
remove unused stuff
mabaasit Jan 15, 2025
b5486be
Merge branch 'main' into flakes-fix
mabaasit Jan 16, 2025
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: 7 additions & 5 deletions packages/compass-e2e-tests/tests/collection-aggregations-tab.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,12 +1332,14 @@ describe('Collection aggregations tab', function () {
});
await browser.waitForAriaDisabled(previousButton, true);

// previousButton has a tooltip, to close it we press Escape
// and wait a bit (for the debounced close to kick in)
await browser.keys([Key.Escape]);
await sleep(50);
// previousButton has a tooltip and as it becomes disabled,
// tooltip disappers. wait for it to disappear
await browser.waitForAnimations(Selectors.FocusModeModal);

// the next Escape is for the modal to close
// As the tooltip disappeared at this point, the previousButton still
// has the focus. Pressing escape twice, should close the modal.
await browser.keys([Key.Escape]);
await sleep(100);
await browser.keys([Key.Escape]);
Copy link
Collaborator

@gribnoysup gribnoysup Jan 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe there is a way for us to do it without an arbitrary timeout, like removing the focus from the button? Also just generally wondering why button is swallowing the Esc keypress in this case, is this a bug? Nevermind this part, I tried it out and can see how this happens, just wasn't clear for me from the comment in the code: tooltip shows and this first esc press closes the tooltip.

Copy link
Collaborator Author

@mabaasit mabaasit Jan 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, i can try to remove the focus from it. I think it has to do with tooltip. I tried to re-create this here, with two different versions - one with tooltip and one without tooltip and the one with tooltip has this issue.

Copy link
Collaborator Author

@mabaasit mabaasit Jan 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think without complicating it even more, i'd do as we do at other places, close the modal using its close button.


await modal.waitForDisplayed({ reverse: true });
Expand Down
Loading