Merge pull request #64 from marvinhagemeister/race-navigation

fix: ensure navigation listeners are setup before trigger
lino-levan · May 23, 2024 · 299bace · 299bace
2 parents 4985628 + ea41411
commit 299bace
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/docs/pages/guides/navigation.md b/docs/pages/guides/navigation.md
@@ -36,17 +36,17 @@ await page.waitForNetworkIdle({ idleConnections: 0, idleTime: 1000 });
 // Click the 'pyro' link
 const xLink = await page.$("a.justify-between:nth-child(1)");
 await Promise.all([
-  xLink!.click(),
   page.waitForNavigation(),
+  xLink!.click(),
 ]);
 
 // Click the link to 'pyro.deno.dev'
 const dLink = await page.$(
   ".markdown-body > p:nth-child(8) > a:nth-child(1)",
 );
 await Promise.all([
-  dLink!.click(),
   page.waitForNavigation(),
+  dLink!.click(),
 ]);
 
 // Close browser

diff --git a/examples/navigation.ts b/examples/navigation.ts
@@ -20,17 +20,17 @@ await page.waitForNetworkIdle({ idleConnections: 0, idleTime: 1000 });
 // Click the 'pyro' link
 const xLink = await page.$("a.justify-between:nth-child(1)");
 await Promise.all([
-  xLink!.click(),
   page.waitForNavigation(),
+  xLink!.click(),
 ]);
 
 // Click the link to 'pyro.deno.dev'
 const dLink = await page.$(
   ".markdown-body > p:nth-child(8) > a:nth-child(1)",
 );
 await Promise.all([
-  dLink!.click(),
   page.waitForNavigation(),
+  dLink!.click(),
 ]);
 
 // Close browser

diff --git a/src/page.ts b/src/page.ts
@@ -488,11 +488,11 @@ export class Page extends EventTarget {
   async goto(url: string, options?: GoToOptions) {
     options = options ?? {};
     await Promise.all([
+      this.waitForNavigation(options),
       retryDeadline(
         this.#celestial.Page.navigate({ url, ...options }),
         this.timeout,
       ),
-      this.waitForNavigation(options),
     ]);
   }
 
@@ -524,8 +524,8 @@ export class Page extends EventTarget {
    */
   async reload(options?: WaitForOptions) {
     await Promise.all([
-      retryDeadline(this.#celestial.Page.reload({}), this.timeout),
       this.waitForNavigation(options),
+      retryDeadline(this.#celestial.Page.reload({}), this.timeout),
     ]);
   }
 

diff --git a/tests/wait_test.ts b/tests/wait_test.ts
@@ -8,10 +8,10 @@ Deno.test("Wait for selector", async () => {
   const browser = await launch();
 
   // Open the webpage
-  const page = await browser.newPage("http://deno.land");
+  const page = await browser.newPage("https://example.com");
 
   // Wait for selector
-  const selected = await page.waitForSelector(".font-bold");
+  const selected = await page.waitForSelector("h1");
   console.log(selected);
 
   // Close browser
@@ -23,7 +23,7 @@ Deno.test("Fail wait for selector", async () => {
   const browser = await launch();
 
   // Open the webpage
-  const page = await browser.newPage("http://deno.land");
+  const page = await browser.newPage("https://example.com");
 
   await assertRejects(
     () => {