Merge pull request mozilla#18317 from timvandermeij/integration-test-…

…separate-browser-cleanup Close the page in the text layer caret selection integration test
timvandermeij · Jun 23, 2024 · b4393a7 · b4393a7
2 parents 7057142 + f4053c2
commit b4393a7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/test/integration/test_utils.mjs b/test/integration/test_utils.mjs
@@ -81,16 +81,16 @@ function awaitPromise(promise) {
 }
 
 function closePages(pages) {
-  return Promise.all(
-    pages.map(async ([_, page]) => {
-      // Avoid to keep something from a previous test.
-      await page.evaluate(async () => {
-        await window.PDFViewerApplication.testingClose();
-        window.localStorage.clear();
-      });
-      await page.close({ runBeforeUnload: false });
-    })
-  );
+  return Promise.all(pages.map(([_, page]) => closeSinglePage(page)));
+}
+
+async function closeSinglePage(page) {
+  // Avoid to keep something from a previous test.
+  await page.evaluate(async () => {
+    await window.PDFViewerApplication.testingClose();
+    window.localStorage.clear();
+  });
+  await page.close({ runBeforeUnload: false });
 }
 
 async function waitForSandboxTrip(page) {
@@ -634,6 +634,7 @@ export {
   awaitPromise,
   clearInput,
   closePages,
+  closeSinglePage,
   createPromise,
   dragAndDropAnnotation,
   firstPageOnTop,

diff --git a/test/integration/text_layer_spec.mjs b/test/integration/text_layer_spec.mjs
@@ -13,7 +13,12 @@
  * limitations under the License.
  */
 
-import { closePages, getSpanRectFromText, loadAndWait } from "./test_utils.mjs";
+import {
+  closePages,
+  closeSinglePage,
+  getSpanRectFromText,
+  loadAndWait,
+} from "./test_utils.mjs";
 import { startBrowser } from "../test.mjs";
 
 describe("Text layer", () => {
@@ -227,6 +232,7 @@ describe("Text layer", () => {
         );
       });
       afterAll(async () => {
+        await closeSinglePage(page);
         await browser.close();
       });