Merge branch 'main' into 918-rwd-menu

cfpb · Oct 29, 2024 · 3225e64 · 3225e64
2 parents 2f5c034 + ce7802d
commit 3225e64
Show file tree

Hide file tree

Showing 55 changed files with 796 additions and 453 deletions.
diff --git a/e2e/example.spec.demo.ts b/e2e/example.spec.demo.ts
@@ -4,11 +4,9 @@ import { expect } from '@playwright/test';
 import { test } from './fixtures/testFixture';
 import pointOfContactJson from './test-data/point-of-contact/point-of-contact-data-1.json';
 import { ResultUploadMessage, uploadFile } from './utils/uploadFile';
+import { clickContinue } from './utils/navigation.utils';
 
 test('proof of concept', async ({ page }) => {
-  test.slow();
-  const minorDelay = 500;
-
   await test.step('Unauthenticated homepage: navigate to Authenticated homepage', async () => {
     await page.goto('/');
     await expect(page.locator('h1')).toContainText(
@@ -55,9 +53,7 @@ test('proof of concept', async ({ page }) => {
     });
 
     await test.step('Upload file: navigate to Resolve errors (syntax) with no errors after upload', async () => {
-      await page.waitForSelector('#nav-next');
-      await page.waitForTimeout(minorDelay);
-      await page.getByRole('button', { name: 'Continue' }).click();
+      await clickContinue(test, page);
       await expect(page.locator('h1')).toContainText('Resolve errors (syntax)');
     });
 
@@ -72,14 +68,14 @@ test('proof of concept', async ({ page }) => {
     await expect(page.locator('h1')).toContainText('Review warnings');
   });
 
-  await test.step('Review warnings: navigate to Provide point of contact', async () => {
+  await test.step('Review warnings: navigate to Provide filing details', async () => {
     await page.getByText('I verify the accuracy of').click();
     await page.getByRole('button', { name: 'Continue to next step' }).click();
-    await expect(page.locator('h1')).toContainText('Provide point of contact');
+    await expect(page.locator('h1')).toContainText('Provide filing details');
   });
 
-  await test.step('Provide point of contact: navigate to Sign and submit', async () => {
-    await test.step('Provide point of contact: fill out form', async () => {
+  await test.step('Provide filing details: navigate to Sign and submit', async () => {
+    await test.step('Provide filing details: fill out form', async () => {
       await page.getByLabel('First name').fill(pointOfContactJson.first_name);
       await page.getByLabel('Last name').fill(pointOfContactJson.last_name);
       await page
@@ -111,7 +107,7 @@ test('proof of concept', async ({ page }) => {
         .getByLabel('ZIP codeZIP code must be in')
         .fill(pointOfContactJson.hq_address_zip);
     });
-    await test.step('Provide point of contact: continue to next step', async () => {
+    await test.step('Provide filing details: continue to next step', async () => {
       await page.getByRole('button', { name: 'Continue to next step' }).click();
       await expect(page.locator('h1')).toContainText('Sign and submit');
     });

diff --git a/e2e/fixtures/testFixture.ts b/e2e/fixtures/testFixture.ts
@@ -1,4 +1,11 @@
-import type { Page } from '@playwright/test';
+import type {
+  Page,
+  PlaywrightTestArgs,
+  PlaywrightTestOptions,
+  PlaywrightWorkerArgs,
+  PlaywrightWorkerOptions,
+  TestType,
+} from '@playwright/test';
 import { test as baseTest, expect } from '@playwright/test';
 import pointOfContactJson from '../test-data/point-of-contact/point-of-contact-data-1.json';
 import createDomainAssociation from '../utils/createDomainAssociation';
@@ -12,6 +19,26 @@ import {
   getTestDataObject,
 } from '../utils/testFixture.utils';
 import { ResultUploadMessage, uploadFile } from '../utils/uploadFile';
+import { clickContinue, clickContinueNext } from '../utils/navigation.utils';
+
+export type SBLPlaywrightTest = TestType<
+  PlaywrightTestArgs &
+    PlaywrightTestOptions & {
+      isNonAssociatedUser: boolean; // Skips creating a domain association and creating a financial institution
+      account: Account;
+      authHook: void;
+      navigateToAuthenticatedHomePage: Page;
+      navigateToFilingHome: Page;
+      navigateToProvideTypeOfFinancialInstitution: Page;
+      navigateToUploadFile: Page;
+      navigateToReviewWarningsAfterOnlyWarningsUpload: Page;
+      navigateToSyntaxErrorsAfterSyntaxErrorsUpload: Page;
+      navigateToLogicErrorsAfterLogicErrorsUpload: Page;
+      navigateToProvidePointOfContact: Page;
+      navigateToSignAndSubmit: Page;
+    },
+  PlaywrightWorkerArgs & PlaywrightWorkerOptions
+>;
 
 export const test = baseTest.extend<{
   isNonAssociatedUser: boolean; // Skips creating a domain association and creating a financial institution
@@ -100,7 +127,6 @@ export const test = baseTest.extend<{
         await page.getByRole('button', { name: 'Sign In' }).click();
         await expect(page.locator('h1')).toContainText(
           'Complete your user profile',
-          { timeout: 30_000 },
         );
 
         // Two versions of Complete User Profile - with and without associations
@@ -183,11 +209,8 @@ export const test = baseTest.extend<{
         exact: true,
       });
       await page.getByText('Bank or savings association').click();
-      await page.getByRole('button', { name: 'Continue' }).click();
-
-      await expect(page.locator('h1')).toContainText('Upload file', {
-        timeout: 30_000,
-      });
+      await clickContinue(test, page);
+      await expect(page.locator('h1')).toContainText('Upload file');
       await use(page);
     });
   },
@@ -210,11 +233,7 @@ export const test = baseTest.extend<{
       });
 
       await test.step('Upload file: navigate to Resolve errors (syntax) with no errors after upload', async () => {
-        await page.waitForSelector('#nav-next');
-        await page.waitForTimeout(500);
-        await page
-          .getByRole('button', { name: 'Continue to next step' })
-          .click();
+        await clickContinueNext(test, page);
         await expect(page.locator('h1')).toContainText(
           'Resolve errors (syntax)',
         );
@@ -242,18 +261,14 @@ export const test = baseTest.extend<{
       });
 
       await test.step('Upload file: navigate to Resolve errors (syntax) with no errors after upload', async () => {
-        await page.waitForSelector('#nav-next');
-        await page.waitForTimeout(500);
-        await page
-          .getByRole('button', { name: 'Continue to next step' })
-          .click();
+        await clickContinueNext(test, page);
         await expect(page.locator('h1')).toContainText(
           'Resolve errors (syntax)',
         );
       });
 
       await test.step('Resolve errors (logic): navigate to Resolve errors (logic) with errors after upload', async () => {
-        await page.getByRole('button', { name: 'Continue' }).click();
+        await clickContinue(test, page);
         await expect(page.locator('h1')).toContainText(
           'Resolve errors (logic)',
         );
@@ -281,27 +296,21 @@ export const test = baseTest.extend<{
       });
 
       await test.step('Upload file: navigate to Resolve errors (syntax) with no errors after upload', async () => {
-        await page.waitForSelector('#nav-next');
-        await page.waitForTimeout(500);
-        await page
-          .getByRole('button', { name: 'Continue to next step' })
-          .click();
+        await clickContinueNext(test, page);
         await expect(page.locator('h1')).toContainText(
           'Resolve errors (syntax)',
         );
       });
 
       await test.step('Resolve errors (syntax): navigate to Resolve errors (logic) with no errors after upload', async () => {
-        await page.getByRole('button', { name: 'Continue' }).click();
+        await clickContinue(test, page);
         await expect(page.locator('h1')).toContainText(
           'Resolve errors (logic)',
         );
       });
 
       await test.step('Resolve errors (logic): navigate to Review warnings', async () => {
-        await page
-          .getByRole('button', { name: 'Continue to next step' })
-          .click();
+        await clickContinueNext(test, page);
         await expect(page.locator('h1')).toContainText('Review warnings');
       });
       await use(page);
@@ -313,13 +322,10 @@ export const test = baseTest.extend<{
     use,
   ) => {
     navigateToReviewWarningsAfterOnlyWarningsUpload;
-    await test.step('Review warnings: navigate to Provide point of contact', async () => {
+    await test.step('Review warnings: navigate to Provide filing details', async () => {
       await page.getByText('I verify the accuracy of').click();
-      await page.getByRole('button', { name: 'Continue to next step' }).click();
-      await expect(page.locator('h1')).toContainText(
-        'Provide point of contact',
-        { timeout: 30_000 },
-      );
+      await clickContinueNext(test, page);
+      await expect(page.locator('h1')).toContainText('Provide filing details');
     });
     await use(page);
   },
@@ -329,8 +335,8 @@ export const test = baseTest.extend<{
     use,
   ) => {
     navigateToProvidePointOfContact;
-    await test.step('Provide point of contact: navigate to Sign and submit', async () => {
-      await test.step('Provide point of contact: fill out form', async () => {
+    await test.step('Provide filing details: navigate to Sign and submit', async () => {
+      await test.step('Provide filing details: fill out form', async () => {
         await page.getByLabel('First name').fill(pointOfContactJson.first_name);
         await page.getByLabel('Last name').fill(pointOfContactJson.last_name);
         await page
@@ -362,10 +368,8 @@ export const test = baseTest.extend<{
           .getByLabel('ZIP codeZIP code must be in')
           .fill(pointOfContactJson.hq_address_zip);
       });
-      await test.step('Provide point of contact: continue to next step', async () => {
-        await page
-          .getByRole('button', { name: 'Continue to next step' })
-          .click();
+      await test.step('Provide filing details: continue to next step', async () => {
+        await clickContinueNext(test, page);
         await expect(page.locator('h1')).toContainText('Sign and submit');
       });
     });

diff --git a/e2e/pages/filing-app/complete-user-profile/checkCupFormErrors.spec.ts b/e2e/pages/filing-app/complete-user-profile/checkCupFormErrors.spec.ts
@@ -7,15 +7,11 @@ import { controlUnicode } from '../../../utils/unicodeConstants';
 test('Complete the User Profile: Checking for form errors based on user input', async ({
   page,
 }) => {
-  test.slow();
-
   await test.step('Complete the User Profile: Check that the error header render when no input is filled', async () => {
     await page.getByLabel('Submit User Profile').click();
-    await expect(page.locator('#step1FormErrorHeader div').first()).toBeVisible(
-      {
-        timeout: 30_000,
-      },
-    );
+    await expect(
+      page.locator('#step1FormErrorHeader div').first(),
+    ).toBeVisible();
   });
 
   await test.step('Complete the User Profile: Check the first and last names for invalid input', async () => {
@@ -40,15 +36,11 @@ test('Complete the User Profile: Checking for form errors based on user input',
 test('Complete the User Profile: Checking for input length restriction', async ({
   page,
 }) => {
-  test.slow();
-
   await test.step('Complete the User Profile: Check that the error header render when no input is filled', async () => {
     await page.getByLabel('Submit User Profile').click();
-    await expect(page.locator('#step1FormErrorHeader div').first()).toBeVisible(
-      {
-        timeout: 30_000,
-      },
-    );
+    await expect(
+      page.locator('#step1FormErrorHeader div').first(),
+    ).toBeVisible();
   });
 
   await test.step('Complete the User Profile: Check the first and last names for invalid input', async () => {

diff --git a/e2e/pages/filing-app/filing-step-routing/_shared.ts b/e2e/pages/filing-app/filing-step-routing/_shared.ts
@@ -32,7 +32,7 @@ export const verifyRedirects = async ({
   for (const futureStep of userShouldNotAccess) {
     await test.step(`${testLabel}: Verify user cannot access ${futureStep}`, async () => {
       await page.goto(baseURL + futureStep);
-      await expect(page).toHaveURL(afterRedirectURL, { timeout: 10_000 });
+      await expect(page).toHaveURL(afterRedirectURL);
       await expect(page.locator('h1')).toContainText(afterRedirectHeading);
     });
   }

diff --git a/e2e/pages/filing-app/filing-step-routing/errorsLogic.spec.ts b/e2e/pages/filing-app/filing-step-routing/errorsLogic.spec.ts
@@ -13,8 +13,6 @@ const afterRedirectURL = /.*errors\/errors-syntax$/;
 test(
   testLabel,
   async ({ page, navigateToLogicErrorsAfterLogicErrorsUpload }) => {
-    test.slow();
-
     navigateToLogicErrorsAfterLogicErrorsUpload;
 
     await verifyRedirects({

diff --git a/e2e/pages/filing-app/filing-step-routing/errorsSyntax.spec.ts b/e2e/pages/filing-app/filing-step-routing/errorsSyntax.spec.ts
@@ -18,8 +18,6 @@ const afterRedirectURL = /.*errors\/errors-syntax$/;
 test(
   testLabel,
   async ({ page, navigateToSyntaxErrorsAfterSyntaxErrorsUpload }) => {
-    test.slow();
-
     navigateToSyntaxErrorsAfterSyntaxErrorsUpload;
 
     await verifyRedirects({

diff --git a/e2e/pages/filing-app/filing-step-routing/noUpload.spec.ts b/e2e/pages/filing-app/filing-step-routing/noUpload.spec.ts
@@ -11,8 +11,6 @@ const afterRedirectHeading = 'Upload file';
 const afterRedirectURL = /.*\/upload$/;
 
 test(testLabel, async ({ page, navigateToUploadFile }) => {
-  test.slow();
-
   navigateToUploadFile;
 
   await verifyRedirects({

diff --git a/e2e/pages/filing-app/filing-step-routing/pointOfContact.spec.ts b/e2e/pages/filing-app/filing-step-routing/pointOfContact.spec.ts
@@ -7,12 +7,10 @@ const currentStepPath = '/contact';
 
 const userShouldNotAccess = ['/submit'];
 
-const afterRedirectHeading = 'Provide point of contact';
+const afterRedirectHeading = 'Provide filing details';
 const afterRedirectURL = /.*\/contact$/;
 
 test(testLabel, async ({ page, navigateToProvidePointOfContact }) => {
-  test.slow();
-
   navigateToProvidePointOfContact;
 
   await verifyRedirects({

diff --git a/e2e/pages/filing-app/filing-step-routing/warnings.spec.ts b/e2e/pages/filing-app/filing-step-routing/warnings.spec.ts
@@ -13,8 +13,6 @@ const afterRedirectURL = /.*\/warnings$/;
 test(
   testLabel,
   async ({ page, navigateToReviewWarningsAfterOnlyWarningsUpload }) => {
-    test.slow();
-
     navigateToReviewWarningsAfterOnlyWarningsUpload;
 
     await verifyRedirects({