Skip to content

Commit

Permalink
Remove most waitForTimeout usage from the freetext editor integrati…
Browse files Browse the repository at this point in the history
…on tests

This commit replaces a `waitForTimeout` occurrence with an equivalent
`waitForSelector` expression, and removes two other `waitForTimeout`
occurrences that are obsolete because we already wait for an observable
event to trigger or class change to happen.

Note that the other `waitForTimeout` occurrences in this file are either
part of mozilla#17931 or remain until we find a good way to ensure that nothing
happened (because currently there is nothing we can await there).
  • Loading branch information
timvandermeij committed May 2, 2024
1 parent c419c83 commit 09b409c
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions test/integration/freetext_editor_spec.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ const copyPaste = async page => {
await kbCopy(page);
await promise;

// eslint-disable-next-line no-restricted-syntax
await waitForTimeout(10);

promise = waitForEvent(page, "paste");
await kbPaste(page);
await promise;
Expand Down Expand Up @@ -1364,9 +1361,6 @@ describe("FreeText Editor", () => {
// Enter in editing mode.
await switchToFreeText(page);

// eslint-disable-next-line no-restricted-syntax
await waitForTimeout(200);

// Disable editing mode.
await page.click("#editorFreeText");
await page.waitForSelector(
Expand Down Expand Up @@ -2411,14 +2405,7 @@ describe("FreeText Editor", () => {

// The editor must be moved in the DOM and potentially the focus
// will be lost, hence there's a callback will get back the focus.
// eslint-disable-next-line no-restricted-syntax
await waitForTimeout(200);

const focused = await page.evaluate(sel => {
const editor = document.querySelector(sel);
return editor === document.activeElement;
}, getEditorSelector(1));
expect(focused).withContext(`In ${browserName}`).toEqual(true);
await page.waitForSelector(`${getEditorSelector(1)}:focus`);

expect(await pos(0))
.withContext(`In ${browserName}`)
Expand Down

0 comments on commit 09b409c

Please sign in to comment.