Fix e2e onboarding helper

tahowallet · Jun 26, 2023 · dad8022 · dad8022
1 parent 274e01e
commit dad8022
Showing 1 changed file with 6 additions and 34 deletions.
diff --git a/e2e-tests/utils/onboarding.ts b/e2e-tests/utils/onboarding.ts
@@ -3,25 +3,21 @@ import { BrowserContext, test as base, expect, Page } from "@playwright/test"
 export const getOnboardingPage = async (
   context: BrowserContext
 ): Promise<Page> => {
-  await expect(async () => {
+  const getOnboardingOrThrow = () => {
     const pages = context.pages()
+
     const onboarding = pages.find((page) => /onboarding/.test(page.url()))
 
     if (!onboarding) {
       throw new Error("Unable to find onboarding tab")
     }
 
-    expect(onboarding).toHaveURL(/onboarding/)
-  }).toPass()
-
-  const onboarding = context.pages().at(-1)
-
-  if (!onboarding) {
-    // Should never happen
-    throw new Error("Onboarding page closed too early")
+    return onboarding
   }
 
-  return onboarding
+  await expect(async () => getOnboardingOrThrow()).toPass()
+
+  return getOnboardingOrThrow()
 }
 
 const DEFAULT_PASSWORD = "12345678"
@@ -37,30 +33,6 @@ export default class OnboardingHelper {
     public readonly context: BrowserContext
   ) {}
 
-  async getOnboardingPage(): Promise<Page> {
-    await expect(async () => {
-      const pages = this.context.pages()
-      const onboarding = pages.find((page) => /onboarding/.test(page.url()))
-
-      if (!onboarding) {
-        throw new Error("Unable to find onboarding tab")
-      }
-
-      expect(onboarding).toHaveURL(/onboarding/)
-    }).toPass()
-
-    const onboarding = this.context
-      .pages()
-      .find((page) => /onboarding/.test(page.url()))
-
-    if (!onboarding) {
-      // Should never happen
-      throw new Error("Onboarding page closed too early")
-    }
-
-    return onboarding
-  }
-
   async addReadOnlyAccount(
     addressOrName: string,
     onboardingPage?: Page