Marmelator/pdf.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17974 from timvandermeij/integration-tests-timeout-scripting

Browse Source 
Remove most `waitForTimeout` usage from the scripting integration tests
This commit is contained in:
Tim van der Meij 2024-05-21 20:53:51 +02:00 committed by GitHub
commit 14942271d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
test/integration/scripting_spec.mjs
View File

@ -1713,11 +1713,9 @@ describe("Interaction", () => {
await clearInput(page, getSelector("27R")); await clearInput(page, getSelector("27R"));
await page.type(getSelector("27R"), exportValue); await page.type(getSelector("27R"), exportValue);
await page.click("[data-annotation-id='28R']"); await page.click("[data-annotation-id='28R']");
// eslint-disable-next-line no-restricted-syntax await page.waitForFunction(
await waitForTimeout(10); `${getQuerySelector("24R")}.value === "${exportValue}"`
);
value = await page.$eval(getSelector("24R"), el => el.value);
expect(value).withContext(`In ${browserName}`).toEqual(exportValue);
} }
}) })
); );
@ -1761,9 +1759,10 @@ describe("Interaction", () => {
await page.waitForFunction( await page.waitForFunction(
`${getQuerySelector("30R")}.value !== "abc"` `${getQuerySelector("30R")}.value !== "abc"`
); );
// eslint-disable-next-line no-restricted-syntax
await waitForTimeout(100);
await page.waitForFunction(
`window.document.activeElement.getAttribute("data-element-id") !== "30R"`
);
const focusedId = await page.evaluate(_ => const focusedId = await page.evaluate(_ =>
window.document.activeElement.getAttribute("data-element-id") window.document.activeElement.getAttribute("data-element-id")
); );
@ -1858,8 +1857,7 @@ describe("Interaction", () => {
expect(text).withContext(`In ${browserName}`).toEqual("00000000123"); expect(text).withContext(`In ${browserName}`).toEqual("00000000123");
await page.click(getSelector("26R")); await page.click(getSelector("26R"));
// eslint-disable-next-line no-restricted-syntax await waitForSandboxTrip(page);
await waitForTimeout(10);
text = await page.$eval(getSelector("25R"), el => el.value); text = await page.$eval(getSelector("25R"), el => el.value);
expect(text).withContext(`In ${browserName}`).toEqual("00000000123"); expect(text).withContext(`In ${browserName}`).toEqual("00000000123");
@ -1893,15 +1891,15 @@ describe("Interaction", () => {
expect(text).withContext(`In ${browserName}`).toEqual("5,25"); expect(text).withContext(`In ${browserName}`).toEqual("5,25");
await page.click(getSelector("22R")); await page.click(getSelector("22R"));
// eslint-disable-next-line no-restricted-syntax await waitForSandboxTrip(page);
await waitForTimeout(10);
text = await page.$eval(getSelector("22R"), el => el.value); text = await page.$eval(getSelector("22R"), el => el.value);
expect(text).withContext(`In ${browserName}`).toEqual("5,25"); expect(text).withContext(`In ${browserName}`).toEqual("5,25");
await page.click(getSelector("31R")); await page.click(getSelector("31R"));
// eslint-disable-next-line no-restricted-syntax await page.waitForFunction(
await waitForTimeout(10); `${getQuerySelector("31R")}.value !== "5,25"`
);
text = await page.$eval(getSelector("31R"), el => el.value); text = await page.$eval(getSelector("31R"), el => el.value);
expect(text).withContext(`In ${browserName}`).toEqual("5.25"); expect(text).withContext(`In ${browserName}`).toEqual("5.25");
@ -1993,18 +1991,10 @@ describe("Interaction", () => {
await page.click(getSelector("26R")); await page.click(getSelector("26R"));
await page.type(getSelector("26R"), "abcde", { delay: 10 }); await page.type(getSelector("26R"), "abcde", { delay: 10 });
await page.click(getSelector("23R")); await page.click(getSelector("23R"));
// eslint-disable-next-line no-restricted-syntax await clearInput(page, getSelector("26R"));
await waitForTimeout(10);
await page.click(getSelector("26R"));
await kbSelectAll(page);
await page.keyboard.press("Backspace");
await page.click(getSelector("23R")); await page.click(getSelector("23R"));
// eslint-disable-next-line no-restricted-syntax await waitForSandboxTrip(page);
await waitForTimeout(10);
text = await page.$eval(getSelector("26R"), el => el.value); text = await page.$eval(getSelector("26R"), el => el.value);
expect(text).withContext(`In ${browserName}`).toEqual(""); expect(text).withContext(`In ${browserName}`).toEqual("");
@ -2151,33 +2141,37 @@ describe("Interaction", () => {
); );
expect(readonly).withContext(`In ${browserName}`).toEqual(true); expect(readonly).withContext(`In ${browserName}`).toEqual(true);
await page.click(getSelector("334R")); await page.click(getSelector("334R"));
// eslint-disable-next-line no-restricted-syntax await waitForSandboxTrip(page);
await waitForTimeout(10);
readonly = await page.$eval(getSelector("353R"), el => el.disabled); readonly = await page.$eval(getSelector("353R"), el => el.disabled);
expect(readonly).withContext(`In ${browserName}`).toEqual(true); expect(readonly).withContext(`In ${browserName}`).toEqual(true);
await page.click(getSelector("351R")); await page.click(getSelector("351R"));
// eslint-disable-next-line no-restricted-syntax await waitForSandboxTrip(page);
await waitForTimeout(10);
readonly = await page.$eval(getSelector("353R"), el => el.disabled); readonly = await page.$eval(getSelector("353R"), el => el.disabled);
expect(readonly).withContext(`In ${browserName}`).toEqual(true); expect(readonly).withContext(`In ${browserName}`).toEqual(true);
await page.click(getSelector("352R")); await page.click(getSelector("352R"));
// eslint-disable-next-line no-restricted-syntax await page.waitForFunction(
await waitForTimeout(10); `${getQuerySelector("353R")}.disabled !== true`
);
readonly = await page.$eval(getSelector("353R"), el => el.disabled); readonly = await page.$eval(getSelector("353R"), el => el.disabled);
expect(readonly).withContext(`In ${browserName}`).toEqual(false); expect(readonly).withContext(`In ${browserName}`).toEqual(false);
await page.click(getSelector("353R")); await page.click(getSelector("353R"));
// eslint-disable-next-line no-restricted-syntax await page.waitForFunction(
await waitForTimeout(10); `${getQuerySelector("353R")}.checked !== false`
);
let checked = await page.$eval(getSelector("353R"), el => el.checked); let checked = await page.$eval(getSelector("353R"), el => el.checked);
expect(checked).withContext(`In ${browserName}`).toEqual(true); expect(checked).withContext(`In ${browserName}`).toEqual(true);
await page.click(getSelector("334R")); await page.click(getSelector("334R"));
// eslint-disable-next-line no-restricted-syntax await page.waitForFunction(
await waitForTimeout(10); `${getQuerySelector("353R")}.disabled !== false`
);
await page.waitForFunction(
`${getQuerySelector("353R")}.checked !== true`
);
readonly = await page.$eval(getSelector("353R"), el => el.disabled); readonly = await page.$eval(getSelector("353R"), el => el.disabled);
expect(readonly).withContext(`In ${browserName}`).toEqual(true); expect(readonly).withContext(`In ${browserName}`).toEqual(true);
@ -2216,13 +2210,9 @@ describe("Interaction", () => {
await page.click(getSelector("55R")); await page.click(getSelector("55R"));
await page.type(getSelector("55R"), "Hello", { delay: 10 }); await page.type(getSelector("55R"), "Hello", { delay: 10 });
await page.click(getSelector("56R")); await page.click(getSelector("56R"));
// eslint-disable-next-line no-restricted-syntax
await waitForTimeout(10);
await page.click(getSelector("55R")); await page.click(getSelector("55R"));
await page.type(getSelector("55R"), " World", { delay: 10 }); await page.type(getSelector("55R"), " World", { delay: 10 });
// eslint-disable-next-line no-restricted-syntax
await waitForTimeout(10);
await otherPages[i].bringToFront(); await otherPages[i].bringToFront();
// eslint-disable-next-line no-restricted-syntax // eslint-disable-next-line no-restricted-syntax
@ -2264,8 +2254,6 @@ describe("Interaction", () => {
); );
await page.click(getSelector("25R")); await page.click(getSelector("25R"));
// eslint-disable-next-line no-restricted-syntax
await waitForTimeout(10);
await page.click(getSelector("26R")); await page.click(getSelector("26R"));
await page.waitForFunction( await page.waitForFunction(