Align variable names in the freetext editor integration tests

The `selectorEditor` name is used 57 times, but only in the freetext
editor integration tests file. The `editorSelector` name on the other
hand is used 241 times in all editor integration test files, so this
commit renames the former name to the latter name to achieve consistency
in variable names across all editor integration test files, which also
simplifies upcoming changes.
This commit is contained in:
Tim van der Meij 2025-01-18 19:22:30 +01:00
parent 50b7922f8c
commit 5026af107f
No known key found for this signature in database
GPG Key ID: 8C3FD2925A5F2762

View File

@ -1859,17 +1859,17 @@ 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 !!";
const selectorEditor = 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(selectorEditor, { await page.waitForSelector(editorSelector, {
visible: true, visible: true,
}); });
await page.type(`${selectorEditor} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
const [pageX, pageY] = await getFirstSerialized(page, x => x.rect); const [pageX, pageY] = await getFirstSerialized(page, x => x.rect);
await moveEditor(page, selectorEditor, 20, () => await moveEditor(page, editorSelector, 20, () =>
page.keyboard.press("ArrowRight") page.keyboard.press("ArrowRight")
); );
@ -1881,7 +1881,7 @@ describe("FreeText Editor", () => {
.withContext(`In ${browserName}`) .withContext(`In ${browserName}`)
.toEqual(Math.round(pageY)); .toEqual(Math.round(pageY));
await moveEditor(page, selectorEditor, 20, () => await moveEditor(page, editorSelector, 20, () =>
page.keyboard.press("ArrowDown") page.keyboard.press("ArrowDown")
); );
@ -1893,7 +1893,7 @@ describe("FreeText Editor", () => {
.withContext(`In ${browserName}`) .withContext(`In ${browserName}`)
.toEqual(Math.round(pageY - 20)); .toEqual(Math.round(pageY - 20));
await moveEditor(page, selectorEditor, 2, () => kbBigMoveLeft(page)); await moveEditor(page, editorSelector, 2, () => kbBigMoveLeft(page));
[newX, newY] = await getFirstSerialized(page, x => x.rect); [newX, newY] = await getFirstSerialized(page, x => x.rect);
expect(Math.round(newX)) expect(Math.round(newX))
@ -1903,7 +1903,7 @@ describe("FreeText Editor", () => {
.withContext(`In ${browserName}`) .withContext(`In ${browserName}`)
.toEqual(Math.round(pageY - 20)); .toEqual(Math.round(pageY - 20));
await moveEditor(page, selectorEditor, 2, () => kbBigMoveUp(page)); await moveEditor(page, editorSelector, 2, () => kbBigMoveUp(page));
[newX, newY] = await getFirstSerialized(page, x => x.rect); [newX, newY] = await getFirstSerialized(page, x => x.rect);
expect(Math.round(newX)) expect(Math.round(newX))
@ -1928,8 +1928,8 @@ describe("FreeText Editor", () => {
); );
const pageWidth = page2X - page1X; const pageWidth = page2X - page1X;
const selectorEditor = getEditorSelector(0); const editorSelector = getEditorSelector(0);
await moveEditor(page, selectorEditor, 5, () => await moveEditor(page, editorSelector, 5, () =>
page.keyboard.press("ArrowRight") page.keyboard.press("ArrowRight")
); );
@ -1953,40 +1953,40 @@ 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 !!";
let selectorEditor = 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(selectorEditor, { await page.waitForSelector(editorSelector, {
visible: true, visible: true,
}); });
await page.type(`${selectorEditor} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
const [pageX, pageY] = await getFirstSerialized(page, x => x.rect); const [pageX, pageY] = await getFirstSerialized(page, x => x.rect);
await clearAll(page); await clearAll(page);
selectorEditor = 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(selectorEditor, { await page.waitForSelector(editorSelector, {
visible: true, visible: true,
}); });
await moveEditor(page, selectorEditor, 20, () => await moveEditor(page, editorSelector, 20, () =>
page.keyboard.press("ArrowRight") page.keyboard.press("ArrowRight")
); );
await moveEditor(page, selectorEditor, 2, () => kbBigMoveDown(page)); await moveEditor(page, editorSelector, 2, () => kbBigMoveDown(page));
await moveEditor(page, selectorEditor, 20, () => await moveEditor(page, editorSelector, 20, () =>
page.keyboard.press("ArrowLeft") page.keyboard.press("ArrowLeft")
); );
await moveEditor(page, selectorEditor, 2, () => kbBigMoveUp(page)); await moveEditor(page, editorSelector, 2, () => kbBigMoveUp(page));
await moveEditor(page, selectorEditor, 2, () => kbBigMoveRight(page)); await moveEditor(page, editorSelector, 2, () => kbBigMoveRight(page));
await moveEditor(page, selectorEditor, 2, () => kbBigMoveLeft(page)); await moveEditor(page, editorSelector, 2, () => kbBigMoveLeft(page));
await page.type(`${selectorEditor} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
const [newX, newY] = await getFirstSerialized(page, x => x.rect); const [newX, newY] = await getFirstSerialized(page, x => x.rect);
@ -2130,9 +2130,9 @@ describe("FreeText Editor", () => {
.toEqual(1); .toEqual(1);
const { y: y0, height } = await getRect(page, getEditorSelector(0)); const { y: y0, height } = await getRect(page, getEditorSelector(0));
const selectorEditor = getEditorSelector(1); const editorSelector = getEditorSelector(1);
while ((await getRect(page, selectorEditor)).y > y0 - height) { while ((await getRect(page, editorSelector)).y > y0 - height) {
await moveEditor(page, selectorEditor, 1, () => kbBigMoveUp(page)); await moveEditor(page, editorSelector, 1, () => kbBigMoveUp(page));
} }
// The editor must be moved in the DOM and potentially the focus // The editor must be moved in the DOM and potentially the focus
@ -2287,20 +2287,20 @@ describe("FreeText Editor", () => {
const page1Selector = `.page[data-page-number = "1"] > .annotationEditorLayer.freetextEditing`; const page1Selector = `.page[data-page-number = "1"] > .annotationEditorLayer.freetextEditing`;
let rect = await getRect(page, page1Selector); let rect = await getRect(page, page1Selector);
const selectorEditor = 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(selectorEditor, { await page.waitForSelector(editorSelector, {
visible: true, visible: true,
}); });
await page.type(`${selectorEditor} .internal`, "Hello"); await page.type(`${editorSelector} .internal`, "Hello");
await cancelFocusIn(page, selectorEditor); await cancelFocusIn(page, editorSelector);
await commit(page); await commit(page);
// Unselect. // Unselect.
await page.keyboard.press("Escape"); await page.keyboard.press("Escape");
await waitForUnselectedEditor(page, selectorEditor); await waitForUnselectedEditor(page, editorSelector);
const editorRect = await getRect(page, selectorEditor); const editorRect = await getRect(page, editorSelector);
// Select the editor created previously. // Select the editor created previously.
await page.mouse.click( await page.mouse.click(
@ -2375,20 +2375,20 @@ describe("FreeText Editor", () => {
const page1Selector = `.page[data-page-number = "1"] > .annotationEditorLayer.freetextEditing`; const page1Selector = `.page[data-page-number = "1"] > .annotationEditorLayer.freetextEditing`;
const rect = await getRect(page, page1Selector); const rect = await getRect(page, page1Selector);
const selectorEditor = 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(selectorEditor, { await page.waitForSelector(editorSelector, {
visible: true, visible: true,
}); });
await page.type(`${selectorEditor} .internal`, "Hello"); await page.type(`${editorSelector} .internal`, "Hello");
await cancelFocusIn(page, selectorEditor); await cancelFocusIn(page, editorSelector);
await commit(page); await commit(page);
// Unselect. // Unselect.
await page.keyboard.press("Escape"); await page.keyboard.press("Escape");
await waitForUnselectedEditor(page, selectorEditor); await waitForUnselectedEditor(page, editorSelector);
const editorRect = await getRect(page, selectorEditor); const editorRect = await getRect(page, editorSelector);
// Select the editor created previously. // Select the editor created previously.
await page.mouse.click( await page.mouse.click(
@ -2538,18 +2538,18 @@ describe("FreeText Editor", () => {
await page.focus("#editorFreeTextButton"); await page.focus("#editorFreeTextButton");
await page.keyboard.press("Enter"); await page.keyboard.press("Enter");
let selectorEditor = getEditorSelector(0); let editorSelector = getEditorSelector(0);
await page.waitForSelector(selectorEditor, { await page.waitForSelector(editorSelector, {
visible: true, visible: true,
}); });
await moveEditor(page, selectorEditor, 5, () => kbBigMoveUp(page)); await moveEditor(page, editorSelector, 5, () => kbBigMoveUp(page));
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.type(`${selectorEditor} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
let content = await page.$eval(selectorEditor, el => let content = await page.$eval(editorSelector, el =>
el.innerText.trimEnd() el.innerText.trimEnd()
); );
@ -2560,19 +2560,19 @@ describe("FreeText Editor", () => {
await page.focus("#editorFreeTextButton"); await page.focus("#editorFreeTextButton");
await page.keyboard.press(" "); await page.keyboard.press(" ");
selectorEditor = getEditorSelector(1); editorSelector = getEditorSelector(1);
await page.waitForSelector(selectorEditor, { await page.waitForSelector(editorSelector, {
visible: true, visible: true,
}); });
await moveEditor(page, selectorEditor, 5, () => kbBigMoveDown(page)); await moveEditor(page, editorSelector, 5, () => kbBigMoveDown(page));
await page.type(`${selectorEditor} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
// Unselect. // Unselect.
await page.keyboard.press("Escape"); await page.keyboard.press("Escape");
await waitForUnselectedEditor(page, selectorEditor); await waitForUnselectedEditor(page, editorSelector);
content = await page.$eval(getEditorSelector(1), el => content = await page.$eval(getEditorSelector(1), el =>
el.innerText.trimEnd() el.innerText.trimEnd()
@ -2587,20 +2587,20 @@ describe("FreeText Editor", () => {
await Promise.all( await Promise.all(
pages.map(async ([browserName, page]) => { pages.map(async ([browserName, page]) => {
await page.keyboard.press("Enter"); await page.keyboard.press("Enter");
let selectorEditor = getEditorSelector(2); let editorSelector = getEditorSelector(2);
await page.waitForSelector(selectorEditor, { await page.waitForSelector(editorSelector, {
visible: true, visible: true,
}); });
await moveEditor(page, selectorEditor, 10, () => kbBigMoveLeft(page)); await moveEditor(page, editorSelector, 10, () => kbBigMoveLeft(page));
const data = "Hello PDF.js World !!"; const data = "Hello PDF.js World !!";
await page.type(`${selectorEditor} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
// Unselect. // Unselect.
await page.keyboard.press("Escape"); await page.keyboard.press("Escape");
await waitForUnselectedEditor(page, selectorEditor); await waitForUnselectedEditor(page, editorSelector);
let content = await page.$eval(getEditorSelector(2), el => let content = await page.$eval(getEditorSelector(2), el =>
el.innerText.trimEnd() el.innerText.trimEnd()
@ -2609,23 +2609,23 @@ describe("FreeText Editor", () => {
expect(content).withContext(`In ${browserName}`).toEqual(data); expect(content).withContext(`In ${browserName}`).toEqual(data);
await page.keyboard.press(" "); await page.keyboard.press(" ");
selectorEditor = getEditorSelector(3); editorSelector = getEditorSelector(3);
await page.waitForSelector(selectorEditor, { await page.waitForSelector(editorSelector, {
visible: true, visible: true,
}); });
await moveEditor(page, selectorEditor, 10, () => await moveEditor(page, editorSelector, 10, () =>
kbBigMoveRight(page) kbBigMoveRight(page)
); );
await page.type(`${selectorEditor} .internal`, data); await page.type(`${editorSelector} .internal`, data);
await commit(page); await commit(page);
// Unselect. // Unselect.
await page.keyboard.press("Escape"); await page.keyboard.press("Escape");
await waitForUnselectedEditor(page, selectorEditor); await waitForUnselectedEditor(page, editorSelector);
content = await page.$eval(selectorEditor, el => content = await page.$eval(editorSelector, el =>
el.innerText.trimEnd() el.innerText.trimEnd()
); );