CCM-10004: test stability

Author: mark-r-bjss

tests/test-team/pages/nhs-app/template-mgmt-create-nhs-app-page.ts

@@ -48,13 +48,17 @@ export class TemplateMgmtCreateNhsAppPage extends TemplateMgmtBasePageNonDynamic
     await this.saveAndPreviewButton.click();
   }
 
+  async waitForPageToLoad() {
+    const characterCountLocator = this.page.locator('[id="character-count-0"]');
+    await expect(characterCountLocator).toBeVisible();
+  }
+
   async loadPage() {
     await super.loadPage();
     await this.waitForPageToLoad();
   }
 
-  async waitForPageToLoad() {
-    const characterCountLocator = this.page.locator('[id="character-count-0"]');
-    await expect(characterCountLocator).toBeVisible();
+  async attemptToLoadPageExpectFailure() {
+    await super.loadPage();
   }
 }

tests/test-team/pages/nhs-app/template-mgmt-edit-nhs-app-page.ts

@@ -44,13 +44,17 @@ export class TemplateMgmtEditNhsAppPage extends TemplateMgmtBasePageDynamic {
     await this.saveAndPreviewButton.click();
   }
 
+  async waitForPageToLoad() {
+    const characterCountLocator = this.page.locator('[id="character-count-0"]');
+    await expect(characterCountLocator).toBeVisible();
+  }
+
   async loadPage(templateId: string) {
     await super.loadPage(templateId);
     await this.waitForPageToLoad();
   }
 
-  async waitForPageToLoad() {
-    const characterCountLocator = this.page.locator('[id="character-count-0"]');
-    await expect(characterCountLocator).toBeVisible();
+  async attemptToLoadPageExpectFailure(templateId: string) {
+    await super.loadPage(templateId);
   }
 }

tests/test-team/pages/sms/template-mgmt-create-sms-page.ts

@@ -58,6 +58,10 @@ export class TemplateMgmtCreateSmsPage extends TemplateMgmtBasePageNonDynamic {
     await this.waitForPageToLoad();
   }
 
+  async attemptToLoadPageExpectFailure() {
+    await super.loadPage();
+  }
+
   async waitForPageToLoad() {
     const characterCountLocator = this.page.locator(
       '[data-testid="character-message-count-0"]'

tests/test-team/pages/sms/template-mgmt-edit-sms-page.ts

@@ -53,6 +53,10 @@ export class TemplateMgmtEditSmsPage extends TemplateMgmtBasePageDynamic {
     await this.waitForPageToLoad();
   }
 
+  async attemptToLoadPageExpectFailure(templateId: string) {
+    await super.loadPage(templateId);
+  }
+
   async waitForPageToLoad() {
     const characterCountLocator = this.page.locator(
       '[data-testid="character-message-count-0"]'

tests/test-team/pages/template-mgmt-base-page.ts

@@ -62,6 +62,10 @@ export abstract class TemplateMgmtBasePage {
 
   abstract loadPage(templateId?: string): Promise<void>;
 
+  async attemptToLoadPageExpectFailure(templateId?: string) {
+    await this.loadPage(templateId);
+  }
+
   async navigateTo(url: string) {
     await this.page.goto(url);
   }

tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-edit-nhs-app-template-page.component.spec.ts

@@ -273,7 +273,6 @@ test.describe('Edit NHS App Template Page', () => {
     }) => {
       const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
       await editTemplatePage.loadPage('valid-nhs-app-template');
-      await editTemplatePage.waitForPageToLoad();
       const newTabPromise = page.waitForEvent('popup');
       await page.getByRole('link', { name }).click();
       const newTab = await newTabPromise;
@@ -324,7 +323,7 @@ test.describe('Edit NHS App Template Page', () => {
   test('Invalid template ID test', async ({ page, baseURL }) => {
     const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
     const invalidTemplateId = 'invalid-template-id';
-    await editTemplatePage.loadPage(invalidTemplateId);
+    await editTemplatePage.attemptToLoadPageExpectFailure(invalidTemplateId);
     const errorMessage = page.locator('.nhsuk-heading-xl');
     await Promise.all([
       expect(errorMessage).toBeVisible(),

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

@@ -274,7 +274,7 @@ test.describe('Edit SMS message template Page', () => {
     }) => {
       const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
 
-      await editSmsTemplatePage.loadPage(templates.noSmsTemplateType.id);
+      await editSmsTemplatePage.attemptToLoadPageExpectFailure(templates.noSmsTemplateType.id);
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -285,7 +285,7 @@ test.describe('Edit SMS message template Page', () => {
     }) => {
       const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
 
-      await editSmsTemplatePage.loadPage('/fake-template-id');
+      await editSmsTemplatePage.attemptToLoadPageExpectFailure('/fake-template-id');
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });

tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts

@@ -119,7 +119,9 @@ test.describe('Protected Routes Tests', () => {
       const appPage = new PageModel(page);
       const isDynamic = appPage instanceof TemplateMgmtBasePageDynamic;
 
-      await (isDynamic ? appPage.loadPage('template-id') : appPage.loadPage());
+      await (isDynamic
+        ? appPage.attemptToLoadPageExpectFailure('template-id')
+        : appPage.attemptToLoadPageExpectFailure());
 
       const redirectPath = encodeURIComponent(
         isDynamic