Fix the intermittent failures with PageOpen/PageClose test

mozilla · Oct 29, 2023 · 1867240 · 1867240
1 parent 6115a32
commit 1867240
Showing 1 changed file with 9 additions and 16 deletions.
diff --git a/test/integration/test_utils.mjs b/test/integration/test_utils.mjs
@@ -252,26 +252,19 @@ async function waitForTextLayer(page) {
 }
 
 async function scrollIntoView(page, selector) {
+  const promise = page.evaluate(
+    () =>
+      new Promise(resolve => {
+        document
+          .getElementById("viewerContainer")
+          .addEventListener("scrollend", resolve, { once: true });
+      })
+  );
   await page.evaluate(sel => {
     const element = document.querySelector(sel);
     element.scrollIntoView({ behavior: "instant", block: "start" });
   }, selector);
-  await page.waitForFunction(
-    sel => {
-      const toolbarHeight = document
-        .querySelector("#toolbarContainer")
-        .getBoundingClientRect().height;
-      const element = document.querySelector(sel);
-      const { top, bottom } = element.getBoundingClientRect();
-      return (
-        Math.abs(top) < toolbarHeight + 100 ||
-        Math.abs(bottom - window.innerHeight) < 100 ||
-        (top > toolbarHeight && bottom < window.innerHeight)
-      );
-    },
-    {},
-    selector
-  );
+  await promise;
 }
 
 async function hover(page, selector) {