refactor test

Author: joshunrau

testing/e2e/src/global/global.setup.spec.ts

@@ -1,7 +1,7 @@
 import type { LoginCredentials } from '@opendatacapture/schemas/auth';
-import { expect, test } from '@playwright/test';
 
 import { initAppOptions } from '../helpers/data';
+import { expect, test } from '../helpers/fixtures';
 
 test.skip(() => process.env.GLOBAL_SETUP_COMPLETE === '1');
 
@@ -12,20 +12,9 @@ test.describe.serial(() => {
       expect(response.status()).toBe(200);
       await expect(response.json()).resolves.toMatchObject({ isSetup: false });
     });
-    test('successful setup', async ({ page }) => {
-      await page.goto('/setup');
-      await expect(page).toHaveURL('/setup');
-      const setupForm = page.locator('form[data-cy="setup-form"]');
-      await setupForm.locator('input[name="firstName"]').fill(initAppOptions.admin.firstName);
-      await setupForm.locator('input[name="lastName"]').fill(initAppOptions.admin.lastName);
-      await setupForm.locator('input[name="username"]').fill(initAppOptions.admin.username);
-      await setupForm.locator('input[name="password"]').fill(initAppOptions.admin.password);
-      await setupForm.locator('input[name="confirmPassword"]').fill(initAppOptions.admin.password);
-      await setupForm.locator('#initDemo-true').click();
-      await setupForm.locator('input[name="dummySubjectCount"]').fill(initAppOptions.dummySubjectCount.toString());
-      await setupForm.locator('input[name="recordsPerSubject"]').fill(initAppOptions.recordsPerSubject.toString());
-      await setupForm.getByLabel('Submit').click();
-      await expect(page).toHaveURL('/dashboard');
+    test('successful setup', async ({ setupPage }) => {
+      await setupPage.fillSetupForm(initAppOptions);
+      await setupPage.expect.toHaveURL('/dashboard');
     });
     test('setup state after initialization', async ({ request }) => {
       const response = await request.get('/api/v1/setup');

testing/e2e/src/pages/__root.page.ts

@@ -15,5 +15,6 @@ export abstract class RootPage {
 
   async goto() {
     await this.$ref.goto(this.defaultUrl);
+    await this.$ref.waitForURL(this.defaultUrl);
   }
 }

testing/e2e/src/pages/setup.page.ts

@@ -1,5 +1,26 @@
+import type { InitAppOptions } from '@opendatacapture/schemas/setup';
+import type { Locator, Page } from '@playwright/test';
+
 import { RootPage } from './__root.page';
 
 export class SetupPage extends RootPage {
   protected readonly defaultUrl = '/setup';
+  readonly setupForm: Locator;
+
+  constructor(page: Page) {
+    super(page);
+    this.setupForm = page.getByTestId('setup-form');
+  }
+
+  async fillSetupForm({ admin, dummySubjectCount, recordsPerSubject }: InitAppOptions) {
+    await this.setupForm.locator('input[name="firstName"]').fill(admin.firstName);
+    await this.setupForm.locator('input[name="lastName"]').fill(admin.lastName);
+    await this.setupForm.locator('input[name="username"]').fill(admin.username);
+    await this.setupForm.locator('input[name="password"]').fill(admin.password);
+    await this.setupForm.locator('input[name="confirmPassword"]').fill(admin.password);
+    await this.setupForm.locator('#initDemo-true').click();
+    await this.setupForm.locator('input[name="dummySubjectCount"]').fill(dummySubjectCount?.toString() ?? '');
+    await this.setupForm.locator('input[name="recordsPerSubject"]').fill(recordsPerSubject?.toString() ?? '');
+    await this.setupForm.getByLabel('Submit').click();
+  }
 }