Test fixture/POM cleanup

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "codium.codeCompletion.enable": false
+}

backend/api/tests/unit/get-profiles.unit.test.ts

@@ -316,7 +316,7 @@ describe('loadProfiles', () => {
   })
 
   describe('when an error occurs', () => {
-    it('throw if there is no compatability', async () => {
+    it('throw if there is no compatibility', async () => {
       const props = {
         orderBy: 'compatibility_score',
       }

playwright.config.ts

@@ -25,6 +25,7 @@ function getSupabaseEnv() {
   }
 }
 
+
 const supabaseEnv = getSupabaseEnv()
 
 // Inject into process.env so Playwright and your app code can read them

tests/e2e/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "rootDir": "../../",
     "module": "commonjs",
     "jsx": "react-jsx",
     "moduleResolution": "node",

tests/e2e/utils/firebaseUtils.ts

@@ -1,5 +1,4 @@
 import axios from 'axios'
-
 import {config} from '../web/SPEC_CONFIG'
 
 export async function firebaseLoginEmailPassword(
@@ -73,4 +72,4 @@ export async function deleteAccount(idToken: any) {
     }
     throw err
   }
-}
+}

tests/e2e/web/fixtures/base.ts

@@ -1,29 +1,11 @@
 import {test as base} from '@playwright/test'
-
-import {AuthPage} from '../pages/AuthPage'
-import {ComatibilityPage} from '../pages/compatibilityPage'
-import {HomePage} from '../pages/homePage'
-import {OnboardingPage} from '../pages/onboardingPage'
-import {OrganizationPage} from '../pages/organizationPage'
-import {ProfilePage} from '../pages/profilePage'
-import {SettingsPage} from '../pages/settingsPage'
-import {SignUpPage} from '../pages/signUpPage'
-import {SocialPage} from '../pages/socialPage'
 import {testAccounts, UserAccountInformation} from '../utils/accountInformation'
 import {deleteUser} from '../utils/deleteUser'
 import {getAuthAccountInfo} from '../utils/networkUtils'
+import { App } from '../pages/app'
 
 export const test = base.extend<{
-  homePage: HomePage
-  onboardingPage: OnboardingPage
-  signUpPage: SignUpPage
-  profilePage: ProfilePage
-  authPage: AuthPage
-  settingsPage: SettingsPage
-  socialPage: SocialPage
-  organizationPage: OrganizationPage
-  compatabilityPage: ComatibilityPage
-  cleanUpUsers: void
+  app: App
   onboardingAccount: UserAccountInformation
   fakerAccount: UserAccountInformation
   specAccount: UserAccountInformation
@@ -62,41 +44,9 @@ export const test = base.extend<{
     console.log('Cleaning up spec account...')
     await deleteUser('Email/Password', account)
   },
-  onboardingPage: async ({page}, use) => {
-    const onboardingPage = new OnboardingPage(page)
-    await use(onboardingPage)
-  },
-  homePage: async ({page}, use) => {
-    const homePage = new HomePage(page)
-    await use(homePage)
-  },
-  signUpPage: async ({page}, use) => {
-    const signUpPage = new SignUpPage(page)
-    await use(signUpPage)
-  },
-  authPage: async ({page}, use) => {
-    const authPage = new AuthPage(page)
-    await use(authPage)
-  },
-  profilePage: async ({page}, use) => {
-    const profilePage = new ProfilePage(page)
-    await use(profilePage)
-  },
-  compatabilityPage: async ({page}, use) => {
-    const compatibilityPage = new ComatibilityPage(page)
-    await use(compatibilityPage)
-  },
-  settingsPage: async ({page}, use) => {
-    const settingsPage = new SettingsPage(page)
-    await use(settingsPage)
-  },
-  socialPage: async ({page}, use) => {
-    const socialPage = new SocialPage(page)
-    await use(socialPage)
-  },
-  organizationPage: async ({page}, use) => {
-    const organizationPage = new OrganizationPage(page)
-    await use(organizationPage)
+  app: async ({page}, use) => {
+    const appPage = new App(page)
+    await use(appPage)
   },
 })
 

tests/e2e/web/fixtures/signInFixture.ts

@@ -1,47 +1,17 @@
 import {test as base} from '@playwright/test'
-import {AuthPage} from '../pages/AuthPage'
-import {HomePage} from '../pages/homePage'
+import { App } from '../pages/app'
 import {testAccounts, UserAccountInformation} from '../utils/accountInformation'
-import { OnboardingPage } from '../pages/onboardingPage'
-import { SignUpPage } from '../pages/signUpPage'
-import { ProfilePage } from '../pages/profilePage'
-import { SettingsPage } from '../pages/settingsPage'
 
 export const test = base.extend<{
-  homePage: HomePage
-  onboardingPage: OnboardingPage
-  signUpPage: SignUpPage
-  profilePage: ProfilePage
-  settingsPage: SettingsPage
-  authPage: AuthPage
+  app: App
   dev_one_account: UserAccountInformation
   fakerAccount: UserAccountInformation
   googleAccountOne: UserAccountInformation
   googleAccountTwo: UserAccountInformation
 }>({
-  homePage: async ({page}, use) => {
-    const homePage = new HomePage(page)
-    await use(homePage)
-  },
-  onboardingPage: async ({page}, use) => {
-    const onboardingPage = new OnboardingPage(page)
-    await use(onboardingPage)
-  },
-  signUpPage: async ({page}, use) => {
-    const signUpPage = new SignUpPage(page)
-    await use(signUpPage)
-  },
-  profilePage: async ({page}, use) => {
-    const profilePage = new ProfilePage(page)
-    await use(profilePage)
-  },
-  settingsPage: async ({page}, use) => {
-    const settingsPage = new SettingsPage(page)
-    await use(settingsPage)
-  },
-  authPage: async ({page}, use) => {
-    const authPage = new AuthPage(page)
-    await use(authPage)
+  app: async ({page}, use) => {
+    const appPage = new App(page)
+    await use(appPage)
   },
   dev_one_account: async ({}, use) => {
     const account = testAccounts.dev_one_account()

tests/e2e/web/pages/app.ts

@@ -0,0 +1,78 @@
+import { Page } from "@playwright/test";
+import { UserAccountInformation } from "../utils/accountInformation";
+import { AuthPage } from "./authPage";
+import { ComatibilityPage } from "./compatibilityPage";
+import { HomePage } from "./homePage";
+import { OnboardingPage } from "./onboardingPage";
+import { OrganizationPage } from "./organizationPage";
+import { ProfilePage } from "./profilePage";
+import { SettingsPage } from "./settingsPage";
+import { SignUpPage } from "./signUpPage";
+import { SocialPage } from "./socialPage";
+
+export class App {
+    readonly auth: AuthPage
+    readonly compatibility: ComatibilityPage
+    readonly home: HomePage
+    readonly onboarding: OnboardingPage
+    readonly organization: OrganizationPage
+    readonly profile: ProfilePage
+    readonly settings: SettingsPage
+    readonly signUp: SignUpPage
+    readonly social: SocialPage
+
+    constructor(public readonly page: Page) {
+        this.auth = new AuthPage(page)
+        this.compatibility = new ComatibilityPage(page)
+        this.home = new HomePage(page)
+        this.onboarding = new OnboardingPage(page)
+        this.organization = new OrganizationPage(page)
+        this.profile = new ProfilePage(page)
+        this.settings = new SettingsPage(page)
+        this.signUp = new SignUpPage(page)
+        this.social = new SocialPage(page)
+    }
+
+    async deleteProfileFromSettings() {
+        await this.home.clickSettingsLink()
+        await this.settings.clickDeleteAccountButton()
+        await this.settings.fillDeleteAccountSurvey('Delete me')
+        await this.settings.clickDeleteAccountButton()
+        await this.home.verifyHomePageLinks()
+    }
+
+    async skipOnboardingHeadToProfile(account: UserAccountInformation) {
+        await this.onboarding.clickSkipOnboardingButton()
+        await this.signUp.fillDisplayName(account.display_name)
+        await this.signUp.fillUsername(account.username)
+        await this.signUp.clickNextButton()
+        await this.signUp.clickNextButton()
+        await this.profile.clickCloseButton()
+        await this.onboarding.clickRefineProfileButton()
+    }
+
+    async registerWithEmail(account: UserAccountInformation) {
+        await this.home.goToRegisterPage()
+        await this.auth.fillEmailField(account.email)
+        await this.auth.fillPasswordField(account.password)
+        await this.auth.clickSignUpWithEmailButton()
+    }
+
+    async signinWithEmail(
+        accountOrEmail: UserAccountInformation | string,
+        password?: string,
+    ) {
+        const email = typeof accountOrEmail === 'string' ? accountOrEmail : accountOrEmail.email
+
+        const resolvedPassword = typeof accountOrEmail === 'string' ? password : accountOrEmail.password
+
+        if (!email || !resolvedPassword) {
+            throw new Error('Provide either an `account` or `email` and `password`.')
+        }
+
+        await this.home.goToSigninPage()
+        await this.auth.fillEmailField(email)
+        await this.auth.fillPasswordField(resolvedPassword)
+        await this.auth.clickSignInWithEmailButton()
+    }
+}