CCM-7465: part of testing

Author: bhansell1

frontend/src/utils/validate-template.ts

@@ -55,7 +55,7 @@ export const validateEmailTemplate = (
 };
 
 export const validateSubmittedEmailTemplate = (
-  template: Template | undefined
+  template: TemplateUnion
 ): SubmittedEmailTemplate | undefined => {
   try {
     return $SubmittedEmailTemplate.parse(template);
@@ -66,7 +66,7 @@ export const validateSubmittedEmailTemplate = (
 };
 
 export const validateSubmittedSMSTemplate = (
-  template: Template | undefined
+  template: TemplateUnion
 ): SubmittedSMSTemplate | undefined => {
   try {
     return $SubmittedSMSTemplate.parse(template);
@@ -77,7 +77,7 @@ export const validateSubmittedSMSTemplate = (
 };
 
 export const validateSubmittedNHSAppTemplate = (
-  template: Template | undefined
+  template: TemplateUnion
 ): SubmittedNHSAppTemplate | undefined => {
   try {
     return $SubmittedNHSAppTemplate.parse(template);

tests/test-team/config/auth.setup.ts

@@ -12,7 +12,7 @@ setup('authenticate setup', async ({ page }) => {
 
   await loginPage.cognitoSignIn(process.env.USER_EMAIL);
 
-  await page.waitForEvent('load');
+  await page.waitForURL('/templates/create-and-submit-templates');
 
   await page.context().storageState({ path: 'auth/user.json' });
 });

tests/test-team/config/auth.teardown.ts

@@ -11,15 +11,6 @@ teardown('authenticate teardown', async () => {
   const user = await userHelper.getUser(process.env.USER_EMAIL);
 
   if (user) {
-    // TODO: undo this
-    // await userHelper.deleteUser(user.email);
+    await userHelper.deleteUser(user.email);
   }
-
-  // TODO: delete this.
-  console.log({
-    USER_EMAIL: process.env.USER_EMAIL,
-    USER_ID: process.env.USER_ID,
-    USER_TEMPORARY_PASSWORD: process.env.USER_TEMPORARY_PASSWORD,
-    USER_PASSWORD: process.env.USER_PASSWORD,
-  });
 });

tests/test-team/config/local.config.ts

@@ -13,6 +13,7 @@ export default defineConfig({
       use: {
         baseURL: 'http://localhost:3000',
         ...devices['Desktop Chrome'],
+        headless: true,
       },
     },
     {

tests/test-team/helpers/sleep.ts

@@ -0,0 +1,5 @@
+export function sleep(seconds: number): Promise<void> {
+  return new Promise((resolve) => {
+    setTimeout(resolve, seconds * 1000);
+  });
+}

tests/test-team/helpers/template-storage-helper.ts

@@ -5,6 +5,7 @@ import {
   PutCommand,
 } from '@aws-sdk/lib-dynamodb';
 import { Template } from './types';
+import { sleep } from './sleep';
 
 export class TemplateStorageHelper {
   private readonly ddbDocClient: DynamoDBDocumentClient;
@@ -25,6 +26,9 @@ export class TemplateStorageHelper {
     );
 
     await Promise.all(promises);
+
+    // Note: sleeping to allow DynamoDB some time to settle...
+    await sleep(2);
   }
 
   async deleteTemplateData() {

tests/test-team/template-mgmt-component-tests/sms/template-mgmt-preview-sms-page.component.ts

@@ -26,7 +26,7 @@ const templates = {
   },
 };
 
-test.describe.only('Preview SMS message template Page', () => {
+test.describe('Preview SMS message template Page', () => {
   const templateStorageHelper = new TemplateStorageHelper(
     Object.values(templates)
   );

tests/test-team/template-mgmt-component-tests/template-mgmt-common.steps.ts

@@ -37,14 +37,14 @@ export function assertNotifyBannerLink({
   });
 }
 
-export function assertLoginLink({ page, id, baseURL }: CommonStepsProps) {
+export function assertLoginLink({ page, id }: CommonStepsProps) {
   return test.step('when user clicks "Log in", then user is redirected to "login page"', async () => {
     await page.loadPage(id);
 
-    await page.clickLoginLink();
+    const link = await page.loginLink.getAttribute('href');
 
-    await expect(page.page).toHaveURL(
-      `${baseURL}/auth?redirect=%2Ftemplates%2Fcreate-and-submit-templates`
+    expect(link).toBe(
+      '/auth?redirect=%2Ftemplates%2Fcreate-and-submit-templates'
     );
   });
 }