Merge pull request #18271 from calixteman/clean_before_closing

Clean up before closing the tab in integration tests
mozilla · Jun 18, 2024 · 4c04158 · 4c04158
2 parents 4c82438 + 43be717
commit 4c04158
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/test/integration/test_utils.mjs b/test/integration/test_utils.mjs
@@ -79,7 +79,13 @@ function closePages(pages) {
   return Promise.all(
     pages.map(async ([_, page]) => {
       // Avoid to keep something from a previous test.
-      await page.evaluate(() => window.localStorage.clear());
+      await page.evaluate(async () => {
+        const viewer = window.PDFViewerApplication;
+        viewer.unbindWindowEvents();
+        viewer.unbindEvents();
+        await viewer.close();
+        window.localStorage.clear();
+      });
       await page.close({ runBeforeUnload: false });
     })
   );

diff --git a/web/app.js b/web/app.js
@@ -2098,7 +2098,10 @@ const PDFViewerApplication = {
   unbindWindowEvents() {
     this._windowAbortController?.abort();
     this._windowAbortController = null;
-    if (AppOptions.get("isInAutomation")) {
+    if (
+      (typeof PDFJSDev !== "undefined" && PDFJSDev.test("TESTING")) ||
+      AppOptions.get("isInAutomation")
+    ) {
       this._globalAbortController?.abort();
       this._globalAbortController = null;
     }