Put waitForSelector options on a single line in the editor integration tests

This pattern was already followed quite consistently outside of the
freetext editor integration tests, so this commit aligns the remaining
places for consistency. This also helps to make the tests more compact
and to reduce the number of changes in follow-up changes.
This commit is contained in:
Tim van der Meij 2025-02-02 17:02:24 +01:00
parent e95a26dc1d
commit 9a6511127a
No known key found for this signature in database
GPG Key ID: 8C3FD2925A5F2762
3 changed files with 64 additions and 189 deletions

View File

@ -141,9 +141,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -178,9 +176,7 @@ describe("FreeText Editor", () => {
await copy(page); await copy(page);
await paste(page); await paste(page);
const secondEditorSelector = getEditorSelector(1); const secondEditorSelector = getEditorSelector(1);
await page.waitForSelector(secondEditorSelector, { await page.waitForSelector(secondEditorSelector, { visible: true });
visible: true,
});
await waitForStorageEntries(page, 2); await waitForStorageEntries(page, 2);
const content = await page.$eval(firstEditorSelector, el => const content = await page.$eval(firstEditorSelector, el =>
@ -196,9 +192,7 @@ describe("FreeText Editor", () => {
await copy(page); await copy(page);
await paste(page); await paste(page);
const thirdEditorSelector = getEditorSelector(2); const thirdEditorSelector = getEditorSelector(2);
await page.waitForSelector(thirdEditorSelector, { await page.waitForSelector(thirdEditorSelector, { visible: true });
visible: true,
});
await waitForStorageEntries(page, 3); await waitForStorageEntries(page, 3);
pastedContent = await page.$eval(thirdEditorSelector, el => pastedContent = await page.$eval(thirdEditorSelector, el =>
@ -234,9 +228,7 @@ describe("FreeText Editor", () => {
let editorSelector = getEditorSelector(3); let editorSelector = getEditorSelector(3);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -244,9 +236,7 @@ describe("FreeText Editor", () => {
await copy(page); await copy(page);
await paste(page); await paste(page);
editorSelector = getEditorSelector(4); editorSelector = getEditorSelector(4);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await kbUndo(page); await kbUndo(page);
await page.waitForFunction( await page.waitForFunction(
@ -299,9 +289,7 @@ describe("FreeText Editor", () => {
stacksRect.x + stacksRect.width + 1, stacksRect.x + stacksRect.width + 1,
stacksRect.y + stacksRect.height / 2 stacksRect.y + stacksRect.height / 2
); );
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -328,9 +316,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(8); const editorSelector = getEditorSelector(8);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -374,9 +360,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(9); const editorSelector = getEditorSelector(9);
await page.mouse.click(rect.x + 200, rect.y + 100); await page.mouse.click(rect.x + 200, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {
await page.type(`${editorSelector} .internal`, "A"); await page.type(`${editorSelector} .internal`, "A");
@ -436,9 +420,7 @@ describe("FreeText Editor", () => {
); );
await kbRedo(page); await kbRedo(page);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
text = await getText(); text = await getText();
expect(text).withContext(`In ${browserName}`).toEqual("A"); expect(text).withContext(`In ${browserName}`).toEqual("A");
@ -478,9 +460,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(i); const editorSelector = getEditorSelector(i);
const data = `FreeText ${i}`; const data = `FreeText ${i}`;
await page.mouse.click(lastX, rect.y + rect.height / 10); await page.mouse.click(lastX, rect.y + rect.height / 10);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -524,9 +504,7 @@ describe("FreeText Editor", () => {
await copy(page); await copy(page);
await paste(page); await paste(page);
await page.waitForSelector(getEditorSelector(6), { await page.waitForSelector(getEditorSelector(6), { visible: true });
visible: true,
});
// 0,1,3 are unselected and new pasted editors are selected. // 0,1,3 are unselected and new pasted editors are selected.
expect(await getEditors(page, "selected")) expect(await getEditors(page, "selected"))
@ -575,9 +553,7 @@ describe("FreeText Editor", () => {
rect.x + (rect.width / 10) * 7, rect.x + (rect.width / 10) * 7,
rect.y + rect.height / 10 rect.y + rect.height / 10
); );
await page.waitForSelector(getEditorSelector(7), { await page.waitForSelector(getEditorSelector(7), { visible: true });
visible: true,
});
expect(await getEditors(page, "selected")) expect(await getEditors(page, "selected"))
.withContext(`In ${browserName}`) .withContext(`In ${browserName}`)
.toEqual([7]); .toEqual([7]);
@ -594,9 +570,7 @@ describe("FreeText Editor", () => {
rect.x + (rect.width / 10) * 8, rect.x + (rect.width / 10) * 8,
rect.y + rect.height / 10 rect.y + rect.height / 10
); );
await page.waitForSelector(getEditorSelector(8), { await page.waitForSelector(getEditorSelector(8), { visible: true });
visible: true,
});
expect(await getEditors(page, "selected")) expect(await getEditors(page, "selected"))
.withContext(`In ${browserName}`) .withContext(`In ${browserName}`)
.toEqual([8]); .toEqual([8]);
@ -656,9 +630,7 @@ describe("FreeText Editor", () => {
const data = `Hello PDF.js World !! on page ${pageNumber}`; const data = `Hello PDF.js World !! on page ${pageNumber}`;
expected.push(data); expected.push(data);
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -790,9 +762,7 @@ describe("FreeText Editor", () => {
const x = Math.max(rect.x + 0.1 * rect.width, 10); const x = Math.max(rect.x + 0.1 * rect.width, 10);
const y = Math.max(rect.y + 0.1 * rect.height, 10); const y = Math.max(rect.y + 0.1 * rect.height, 10);
await page.mouse.click(x, y); await page.mouse.click(x, y);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -999,15 +969,12 @@ describe("FreeText Editor", () => {
await Promise.all( await Promise.all(
pages.map(async ([browserName, page]) => { pages.map(async ([browserName, page]) => {
// Show the popup on "Hello World from Firefox" // Show the popup on "Hello World from Firefox"
await page.click(`[data-annotation-id='32R']`); await page.click("[data-annotation-id='32R']");
await page.waitForSelector(`[data-annotation-id='popup_32R']`, { const popupSelector = "[data-annotation-id='popup_32R']";
visible: true, await page.waitForSelector(popupSelector, { visible: true });
});
await switchToFreeText(page); await switchToFreeText(page);
await page.waitForSelector(`[data-annotation-id='popup_32R']`, { await page.waitForSelector(popupSelector, { visible: false });
visible: false,
});
const editorSelector = getEditorSelector(1); const editorSelector = getEditorSelector(1);
await selectEditor(page, editorSelector, /* count = */ 2); await selectEditor(page, editorSelector, /* count = */ 2);
@ -1028,13 +995,10 @@ describe("FreeText Editor", () => {
// Disable editing mode. // Disable editing mode.
await switchToFreeText(page, /* disable = */ true); await switchToFreeText(page, /* disable = */ true);
await page.waitForSelector(popupSelector, { visible: true });
await page.waitForSelector(`[data-annotation-id='popup_32R']`, {
visible: true,
});
const newPopupText = await page.$eval( const newPopupText = await page.$eval(
"[data-annotation-id='popup_32R'] .popupContent", `${popupSelector} .popupContent`,
el => el.innerText.replaceAll("\xa0", " ") el => el.innerText.replaceAll("\xa0", " ")
); );
expect(newPopupText) expect(newPopupText)
@ -1151,9 +1115,7 @@ describe("FreeText Editor", () => {
await selectEditor(page, getEditorSelector(1)); await selectEditor(page, getEditorSelector(1));
await copy(page); await copy(page);
await paste(page); await paste(page);
await page.waitForSelector(getEditorSelector(6), { await page.waitForSelector(getEditorSelector(6), { visible: true });
visible: true,
});
await waitForStorageEntries(page, 7); await waitForStorageEntries(page, 7);
} }
}); });
@ -1302,9 +1264,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -1413,9 +1373,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(currentId); const editorSelector = getEditorSelector(currentId);
const data = `Hello PDF.js World !! on page ${pageNumber}`; const data = `Hello PDF.js World !! on page ${pageNumber}`;
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -1757,9 +1715,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -1804,9 +1760,7 @@ describe("FreeText Editor", () => {
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
await page.mouse.click(rect.x + 200, rect.y + 200); await page.mouse.click(rect.x + 200, rect.y + 200);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -1898,9 +1852,7 @@ describe("FreeText Editor", () => {
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
let editorSelector = getEditorSelector(1); let editorSelector = getEditorSelector(1);
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -1909,9 +1861,7 @@ describe("FreeText Editor", () => {
await clearAll(page); await clearAll(page);
editorSelector = getEditorSelector(2); editorSelector = getEditorSelector(2);
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await moveEditor(page, editorSelector, 20, () => await moveEditor(page, editorSelector, 20, () =>
page.keyboard.press("ArrowRight") page.keyboard.press("ArrowRight")
@ -1976,9 +1926,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await cancelFocusIn(page, editorSelector); await cancelFocusIn(page, editorSelector);
await commit(page); await commit(page);
@ -2031,9 +1979,7 @@ describe("FreeText Editor", () => {
const firstEditorSelector = getEditorSelector(0); const firstEditorSelector = getEditorSelector(0);
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(firstEditorSelector, { await page.waitForSelector(firstEditorSelector, { visible: true });
visible: true,
});
await page.type(`${firstEditorSelector} .internal`, "A"); await page.type(`${firstEditorSelector} .internal`, "A");
await commit(page); await commit(page);
@ -2044,9 +1990,7 @@ describe("FreeText Editor", () => {
rect.x + 5 * rect.width, rect.x + 5 * rect.width,
rect.y + 5 * rect.height rect.y + 5 * rect.height
); );
await page.waitForSelector(secondEditorSelector, { await page.waitForSelector(secondEditorSelector, { visible: true });
visible: true,
});
await page.type(`${secondEditorSelector} .internal`, "B"); await page.type(`${secondEditorSelector} .internal`, "B");
await commit(page); await commit(page);
@ -2113,9 +2057,7 @@ describe("FreeText Editor", () => {
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {
const editorSelector = getEditorSelector(i); const editorSelector = getEditorSelector(i);
await page.mouse.click(rect.x + 10 + 30 * i, rect.y + 100 + 5 * i); await page.mouse.click(rect.x + 10 + 30 * i, rect.y + 100 + 5 * i);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type( await page.type(
`${editorSelector} .internal`, `${editorSelector} .internal`,
String.fromCharCode(65 + i) String.fromCharCode(65 + i)
@ -2175,9 +2117,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await cancelFocusIn(page, editorSelector); await cancelFocusIn(page, editorSelector);
await commit(page); await commit(page);
@ -2229,9 +2169,7 @@ describe("FreeText Editor", () => {
let rect = await getRect(page, page1Selector); let rect = await getRect(page, page1Selector);
const firstEditorSelector = getEditorSelector(0); const firstEditorSelector = getEditorSelector(0);
await page.mouse.click(rect.x + 10, rect.y + 10); await page.mouse.click(rect.x + 10, rect.y + 10);
await page.waitForSelector(firstEditorSelector, { await page.waitForSelector(firstEditorSelector, { visible: true });
visible: true,
});
await page.type(`${firstEditorSelector} .internal`, "Hello"); await page.type(`${firstEditorSelector} .internal`, "Hello");
await cancelFocusIn(page, firstEditorSelector); await cancelFocusIn(page, firstEditorSelector);
await commit(page); await commit(page);
@ -2254,9 +2192,7 @@ describe("FreeText Editor", () => {
rect = await getRect(page, page14Selector); rect = await getRect(page, page14Selector);
const secondEditorSelector = getEditorSelector(1); const secondEditorSelector = getEditorSelector(1);
await page.mouse.click(rect.x + 10, rect.y + 10); await page.mouse.click(rect.x + 10, rect.y + 10);
await page.waitForSelector(secondEditorSelector, { await page.waitForSelector(secondEditorSelector, { visible: true });
visible: true,
});
await page.type(`${secondEditorSelector} .internal`, "World"); await page.type(`${secondEditorSelector} .internal`, "World");
await commit(page); await commit(page);
@ -2271,9 +2207,7 @@ describe("FreeText Editor", () => {
}); });
} }
await page.waitForSelector(firstEditorSelector, { await page.waitForSelector(firstEditorSelector, { visible: true });
visible: true,
});
await selectEditor(page, firstEditorSelector); await selectEditor(page, firstEditorSelector);
const content = await page.$eval(firstEditorSelector, el => const content = await page.$eval(firstEditorSelector, el =>
el.innerText.trimEnd() el.innerText.trimEnd()
@ -2304,9 +2238,7 @@ describe("FreeText Editor", () => {
const rect = await getRect(page, page1Selector); const rect = await getRect(page, page1Selector);
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
await page.mouse.click(rect.x + 10, rect.y + 10); await page.mouse.click(rect.x + 10, rect.y + 10);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, "Hello"); await page.type(`${editorSelector} .internal`, "Hello");
await cancelFocusIn(page, editorSelector); await cancelFocusIn(page, editorSelector);
await commit(page); await commit(page);
@ -2321,10 +2253,7 @@ describe("FreeText Editor", () => {
await scrollIntoView(page, `.page[data-page-number = "14"]`); await scrollIntoView(page, `.page[data-page-number = "14"]`);
await page.waitForSelector( await page.waitForSelector(
`.page[data-page-number = "14"] > .annotationEditorLayer.freetextEditing`, `.page[data-page-number = "14"] > .annotationEditorLayer.freetextEditing`,
{ { visible: true, timeout: 0 }
visible: true,
timeout: 0,
}
); );
await clearAll(page); await clearAll(page);
@ -2342,9 +2271,7 @@ describe("FreeText Editor", () => {
await kbUndo(page); await kbUndo(page);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
}) })
); );
}); });
@ -2384,9 +2311,7 @@ describe("FreeText Editor", () => {
rect.x + rect.width + 5, rect.x + rect.width + 5,
rect.y + rect.height / 2 rect.y + rect.height / 2
); );
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, "Hello Wolrd"); await page.type(`${editorSelector} .internal`, "Hello Wolrd");
await commit(page); await commit(page);
@ -2419,9 +2344,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
const internalEditorSelector = `${editorSelector} .internal`; const internalEditorSelector = `${editorSelector} .internal`;
await page.type(internalEditorSelector, data); await page.type(internalEditorSelector, data);
await commit(page); await commit(page);
@ -2461,9 +2384,7 @@ describe("FreeText Editor", () => {
await page.keyboard.press("Enter"); await page.keyboard.press("Enter");
let editorSelector = getEditorSelector(0); let editorSelector = getEditorSelector(0);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await moveEditor(page, editorSelector, 5, () => kbBigMoveUp(page)); await moveEditor(page, editorSelector, 5, () => kbBigMoveUp(page));
@ -2483,9 +2404,7 @@ describe("FreeText Editor", () => {
await page.focus("#editorFreeTextButton"); await page.focus("#editorFreeTextButton");
await page.keyboard.press(" "); await page.keyboard.press(" ");
editorSelector = getEditorSelector(1); editorSelector = getEditorSelector(1);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await moveEditor(page, editorSelector, 5, () => kbBigMoveDown(page)); await moveEditor(page, editorSelector, 5, () => kbBigMoveDown(page));
@ -2509,9 +2428,7 @@ describe("FreeText Editor", () => {
pages.map(async ([browserName, page]) => { pages.map(async ([browserName, page]) => {
await page.keyboard.press("Enter"); await page.keyboard.press("Enter");
let editorSelector = getEditorSelector(2); let editorSelector = getEditorSelector(2);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await moveEditor(page, editorSelector, 10, () => kbBigMoveLeft(page)); await moveEditor(page, editorSelector, 10, () => kbBigMoveLeft(page));
@ -2530,9 +2447,7 @@ describe("FreeText Editor", () => {
await page.keyboard.press(" "); await page.keyboard.press(" ");
editorSelector = getEditorSelector(3); editorSelector = getEditorSelector(3);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await moveEditor(page, editorSelector, 10, () => await moveEditor(page, editorSelector, 10, () =>
kbBigMoveRight(page) kbBigMoveRight(page)
@ -2574,9 +2489,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -2630,9 +2543,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -2649,9 +2560,7 @@ describe("FreeText Editor", () => {
await kbUndo(page); await kbUndo(page);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
}) })
); );
}); });
@ -2680,9 +2589,7 @@ describe("FreeText Editor", () => {
for (let i = 1; i <= 2; i++) { for (let i = 1; i <= 2; i++) {
const editorSelector = getEditorSelector(i - 1); const editorSelector = getEditorSelector(i - 1);
await page.mouse.click(rect.x + i * 100, rect.y + i * 100); await page.mouse.click(rect.x + i * 100, rect.y + i * 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
} }
@ -2706,14 +2613,8 @@ describe("FreeText Editor", () => {
// Undo. // Undo.
await kbUndo(page); await kbUndo(page);
await waitForSerialized(page, 2); await waitForSerialized(page, 2);
await page.waitForSelector(editorSelector, { visible: true });
await page.waitForSelector(editorSelector, { await page.waitForSelector(getEditorSelector(1), { visible: true });
visible: true,
});
await page.waitForSelector(getEditorSelector(1), {
visible: true,
});
}) })
); );
}); });
@ -2801,9 +2702,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
const data = "Hello\nPDF.js\nWorld\n!!"; const data = "Hello\nPDF.js\nWorld\n!!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -2837,9 +2736,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -2940,9 +2837,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);
@ -2992,9 +2887,7 @@ describe("FreeText Editor", () => {
const editorSelector = getEditorSelector(0); const editorSelector = getEditorSelector(0);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);
@ -3040,9 +2933,7 @@ describe("FreeText Editor", () => {
let editorSelector = getEditorSelector(0); let editorSelector = getEditorSelector(0);
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
@ -3128,9 +3019,7 @@ describe("FreeText Editor", () => {
editorSelector = getEditorSelector(1); editorSelector = getEditorSelector(1);
await page.mouse.click(rect.x + 200, rect.y + 200); await page.mouse.click(rect.x + 200, rect.y + 200);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
const fooBar = "Foo\nBar\nOof"; const fooBar = "Foo\nBar\nOof";
await copyToClipboard(page, { await copyToClipboard(page, {
@ -3297,9 +3186,7 @@ describe("FreeText Editor", () => {
const data = "Hello\nPDF.js\nWorld\n!!"; const data = "Hello\nPDF.js\nWorld\n!!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
for (const line of data.split("\n")) { for (const line of data.split("\n")) {
await page.type(`${editorSelector} .internal`, line); await page.type(`${editorSelector} .internal`, line);
await page.keyboard.down("Shift"); await page.keyboard.down("Shift");
@ -3336,9 +3223,7 @@ describe("FreeText Editor", () => {
const rect = await getRect(page, ".annotationEditorLayer"); const rect = await getRect(page, ".annotationEditorLayer");
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);
@ -3363,9 +3248,7 @@ describe("FreeText Editor", () => {
const rect = await getRect(page, ".annotationEditorLayer"); const rect = await getRect(page, ".annotationEditorLayer");
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);
@ -3398,9 +3281,7 @@ describe("FreeText Editor", () => {
let rect = await getRect(page, ".annotationEditorLayer"); let rect = await getRect(page, ".annotationEditorLayer");
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.mouse.click(rect.x + 100, rect.y + 100); await page.mouse.click(rect.x + 100, rect.y + 100);
await page.waitForSelector(editorSelector, { await page.waitForSelector(editorSelector, { visible: true });
visible: true,
});
await page.type(`${editorSelector} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);
@ -3414,9 +3295,7 @@ describe("FreeText Editor", () => {
const secondEditorSelector = getEditorSelector(1); const secondEditorSelector = getEditorSelector(1);
const newData = "This is a new text box!"; const newData = "This is a new text box!";
await page.mouse.click(rect.x + 150, rect.y + 150); await page.mouse.click(rect.x + 150, rect.y + 150);
await page.waitForSelector(secondEditorSelector, { await page.waitForSelector(secondEditorSelector, { visible: true });
visible: true,
});
await page.type(`${secondEditorSelector} .internal`, newData); await page.type(`${secondEditorSelector} .internal`, newData);
await commit(page); await commit(page);
await waitForSerialized(page, 1); await waitForSerialized(page, 1);

View File

@ -105,9 +105,7 @@ describe("Highlight Editor", () => {
await page.waitForSelector( await page.waitForSelector(
`.page[data-page-number = "1"] svg.highlight`, `.page[data-page-number = "1"] svg.highlight`,
{ { visible: true }
visible: true,
}
); );
}) })
); );

View File

@ -1751,9 +1751,7 @@ describe("Stamp Editor", () => {
const pageOneSelector = `.page[data-page-number = "1"]`; const pageOneSelector = `.page[data-page-number = "1"]`;
const pageTwoSelector = `.page[data-page-number = "2"]`; const pageTwoSelector = `.page[data-page-number = "2"]`;
await scrollIntoView(page, pageTwoSelector); await scrollIntoView(page, pageTwoSelector);
await page.waitForSelector(pageOneSelector, { await page.waitForSelector(pageOneSelector, { visible: false });
visible: false,
});
await switchToStamp(page); await switchToStamp(page);
await scrollIntoView(page, pageOneSelector); await scrollIntoView(page, pageOneSelector);