test/integration/test_utils.mjs

@@ -568,24 +568,16 @@ function waitForAnnotationModeChanged(page) {
   });
 }
 
-function waitForPageRendered(page, pageNumber) {
+function waitForPageRendered(page) {
-  return page.evaluateHandle(
+  return createPromise(page, resolve => {
-    number => [
+    const { eventBus } = window.PDFViewerApplication;
-      new Promise(resolve => {
+    eventBus.on("pagerendered", function handler(e) {
-        const { eventBus } = window.PDFViewerApplication;
+      if (!e.isDetailView) {
-        eventBus.on("pagerendered", function handler(e) {
+        resolve();
-          if (
+        eventBus.off("pagerendered", handler);
-            !e.isDetailView &&
+      }
-            (number === undefined || e.pageNumber === number)
+    });
-          ) {
+  });
-            resolve();
-            eventBus.off("pagerendered", handler);
-          }
-        });
-      }),
-    ],
-    pageNumber
-  );
 }
 
 function waitForEditorMovedInDOM(page) {

test/integration/viewer_spec.mjs

@@ -328,7 +328,7 @@ describe("PDF viewer", () => {
             const originalCanvasSize = await getCanvasSize(page);
             const factor = 2;
 
-            const handle = await waitForPageRendered(page, 1);
+            const handle = await waitForPageRendered(page);
             await page.evaluate(scaleFactor => {
               window.PDFViewerApplication.pdfViewer.increaseScale({
                 drawingDelay: 0,
@@ -356,7 +356,7 @@ describe("PDF viewer", () => {
             const originalCanvasSize = await getCanvasSize(page);
             const factor = 4;
 
-            const handle = await waitForPageRendered(page, 1);
+            const handle = await waitForPageRendered(page);
             await page.evaluate(scaleFactor => {
               window.PDFViewerApplication.pdfViewer.increaseScale({
                 drawingDelay: 0,