Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-06-23 00:15:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21444 from Snuffleupagus/merge-test-password

Browse Source 
Add an integration-test for merging a password-protected PDF
This commit is contained in:
Tim van der Meij 2026-06-14 14:16:35 +02:00 committed by GitHub
commit bfcafbc004
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 80 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
test/integration/reorganize_pages_spec.mjs
View File

@ -3399,6 +3399,67 @@ describe("Reorganize Pages View", () => {
);
});
it("should merge a password-protected PDF after the current page", async () => {
await Promise.all(
pages.map(async ([browserName, page]) => {
await waitForThumbnailVisible(page, 1);
// Navigate to page 2 so the merged PDF is inserted after it.
await page.evaluate(() => {
window.PDFViewerApplication.page = 2;
});
await page.waitForFunction(
() => window.PDFViewerApplication.page === 2
);
await waitAndClick(page, getThumbnailSelector(2));
const handleMerged = await createPromise(page, resolve => {
window.PDFViewerApplication.eventBus.on(
"thumbnailsloaded",
resolve,
{ once: true }
);
});
const picker = await page.$("#viewsManagerAddFilePicker");
await picker.uploadFile(
path.join(__dirname, "../pdfs/issue6010_1.pdf")
);
// Test with an incorrect password first,
// to ensure that re-prompting works correctly.
for (const password of ["Incorrect password", "abc"]) {
await page.waitForSelector("#passwordDialog", { visible: true });
await page.type("#password", password);
await page.keyboard.press("Enter");
}
await awaitPromise(handleMerged);
// Original 3 pages + 1 merged page = 4 pages total.
await page.waitForFunction(
() => parseInt(document.getElementById("pageNumber").max, 10) === 4
);
// Focus must move to the first newly inserted page (page 3, since
// we merged after page 2).
await page.waitForFunction(
() => window.PDFViewerApplication.page === 3
);
// Pages 1–2 come from the original document, then the page of
// the merged PDF, then page 3 of the original shifted to the end.
await waitForHavingContents(page, [1, 2, "Issue 6010", 3]);
await waitForTextToBe(
page,
"#viewsManagerStatusActionLabel",
`${FSI}1${PDI} selected`
);
})
);
});
it("should merge a corrupt PDF (with invalid pages /Count) after the current page", async () => {
await Promise.all(
pages.map(async ([browserName, page]) => {

19
test/integration/test_utils.mjs
View File

@ -151,19 +151,6 @@ function closePages(pages) {
async function closeSinglePage(page) {
const coverage = await page.evaluate(async () => {
// Collect coverage data from the worker before the document is closed.
let workerCoverage = null;
const handler =
window.PDFViewerApplication.pdfDocument?._transport?.messageHandler;
if (handler) {
try {
workerCoverage = await handler.sendWithPromise(
"GetWorkerCoverage",
null
);
} catch {}
}
// Close the viewer gracefully, and clear local storage to avoid state
// leaking from one test to another.
await window.PDFViewerApplication.testingClose();
@ -175,16 +162,14 @@ async function closeSinglePage(page) {
// logic kicks in (see https://github.com/puppeteer/puppeteer/issues/2427).
return {
page: window.__coverage__ ? JSON.stringify(window.__coverage__) : null,
worker: workerCoverage ? JSON.stringify(workerCoverage) : null,
workers: window.__worker_coverage__?.map(c => JSON.stringify(c)) ?? null,
};
});
if (coverage.page) {
mergeCoverageIntoGlobal(JSON.parse(coverage.page));
}
if (coverage.worker) {
mergeCoverageIntoGlobal(JSON.parse(coverage.worker));
}
coverage.workers?.map(c => mergeCoverageIntoGlobal(JSON.parse(c)));
await page.close({ runBeforeUnload: false });
}

17
web/app.js
View File

@ -1165,6 +1165,23 @@ const PDFViewerApplication = {
// Ignoring errors, to ensure that document closing won't break.
}
}
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("COVERAGE")) {
// Collect coverage data from the worker before the document is closed.
//
// Note that `PDFViewerApplication.open` may be invoked multiple times
// during an integration-test (see e.g. the "Merge PDF" tests).
const handler = this.pdfDocument?._transport?.messageHandler;
if (handler) {
try {
const workerCoverage = await handler.sendWithPromise(
"GetWorkerCoverage",
null
);
(window.__worker_coverage__ ??= []).push(workerCoverage);
} catch {}
}
}
const promises = [];
promises.push(this.pdfLoadingTask.destroy());