fix(core): Fix navigation wait logic

acot-a11y · Nov 8, 2020 · 1178dc9 · 1178dc9
1 parent 553e5c3
commit 1178dc9
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/packages/core/src/tester.ts b/packages/core/src/tester.ts
@@ -296,24 +296,17 @@ export class Tester {
   }
 
   private async _waitForReady(page: Page): Promise<void> {
-    const { readyTimeout } = this._config;
+    const { readyTimeout: timeout } = this._config;
 
     await Promise.all([
       page.goto(this._config.url, {
-        timeout: readyTimeout,
+        waitUntil: 'networkidle2',
+        timeout,
+      }),
+      page.waitForNavigation({
+        waitUntil: 'domcontentloaded',
+        timeout,
       }),
-      page.waitForFunction(
-        (url: string) => {
-          const { readyState } = window.document;
-          const ready = ['interactive', 'complete'].includes(readyState);
-          return window.location.href === url && ready;
-        },
-        {
-          polling: 'raf',
-          timeout: readyTimeout,
-        },
-        this._config.url,
-      ),
     ]);
   }