Skip to content

Commit

Permalink
Add a new helper, in the viewer, to close everything during testing
Browse files Browse the repository at this point in the history
This has two advantages, as far as I'm concerned:
 - The tests don't need to manually invoke multiple functions to properly clean-up, which reduces the risk of missing something.
 - By collecting all the relevant clean-up in one method, rather than spreading it out, we get a much better overview of exactly what is being reset.
  • Loading branch information
Snuffleupagus committed Jun 19, 2024
1 parent c53f71a commit c771ac8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
5 changes: 1 addition & 4 deletions test/integration/test_utils.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,7 @@ function closePages(pages) {
pages.map(async ([_, page]) => {
// Avoid to keep something from a previous test.
await page.evaluate(async () => {
const viewer = window.PDFViewerApplication;
viewer.unbindWindowEvents();
viewer.unbindEvents();
await viewer.close();
await window.PDFViewerApplication.testingClose();
window.localStorage.clear();
});
await page.close({ runBeforeUnload: false });
Expand Down
23 changes: 15 additions & 8 deletions web/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2105,14 +2105,21 @@ const PDFViewerApplication = {
unbindWindowEvents() {
this._windowAbortController?.abort();
this._windowAbortController = null;
if (
(typeof PDFJSDev !== "undefined" && PDFJSDev.test("TESTING")) ||
AppOptions.get("isInAutomation")
) {
this._globalAbortController?.abort();
this._globalAbortController = null;
this.l10n?.pause();
}
},

/**
* @ignore
*/
async testingClose() {
this.l10n?.pause();

this.unbindEvents();
this.unbindWindowEvents();

this._globalAbortController?.abort();
this._globalAbortController = null;

await this.close();
},

_accumulateTicks(ticks, prop) {
Expand Down

0 comments on commit c771ac8

Please sign in to comment.