CCM-11544 Test fixes

Author: nicki-nhs

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

@@ -32,6 +32,8 @@ export abstract class TemplateMgmtBasePage {
 
   readonly errorSummaryHeading: Locator;
 
+  readonly errorSummaryHint: Locator;
+
   readonly errorSummaryList: Locator;
 
   readonly skipLink: Locator;
@@ -67,6 +69,8 @@ export abstract class TemplateMgmtBasePage {
       name: 'There is a problem',
     });
 
+    this.errorSummaryHint = this.errorSummary.locator('.nhsuk-hint');
+
     this.errorSummaryList = this.errorSummary.getByRole('listitem');
 
     this.skipLink = page

tests/test-team/template-mgmt-routing-component-tests/choose-templates.routing-component.spec.ts

@@ -519,7 +519,7 @@ test.describe('Routing - Choose Templates page', () => {
     await largePrintItem.clickChooseTemplateLink();
 
     await page.waitForURL(
-      `/templates/message-plans/choose-large-print-letter-template/${routingConfigIds.valid}`
+      `/templates/message-plans/choose-large-print-letter-template/${routingConfigIds.valid}?lockNumber=${messagePlans.valid.lockNumber}`
     );
   });
 
@@ -607,7 +607,7 @@ test.describe('Routing - Choose Templates page', () => {
       await largePrintItem.clickChangeTemplateLink();
 
       await expect(page).toHaveURL(
-        `${baseURL}/templates/message-plans/choose-large-print-letter-template/${routingConfigIds.validWithLetterTemplates}?lockNumber=${messagePlans.validWithLetterTemplates.lockNumber}`
+        `${baseURL}/templates/message-plans/choose-large-print-letter-template/${routingConfigIds.validWithLetterTemplates}?lockNumber=${messagePlans.validWithLetterTemplates.lockNumber + 1}`
       );
     });
   });

tests/test-team/template-mgmt-routing-component-tests/letter/choose-large-print-letter-template.routing-component.spec.ts

@@ -176,22 +176,23 @@ test.describe('Routing - Choose large print letter template page', () => {
       new RoutingChooseLargePrintLetterTemplatePage(page);
     await chooseLargePrintLetterTemplatePage
       .setPathParam('messagePlanId', routingConfigs.valid.id)
+      .setSearchParam('lockNumber', String(routingConfigs.valid.lockNumber))
       .loadPage();
 
     await assertChooseTemplatePageWithTemplatesAvailable({
       page: chooseLargePrintLetterTemplatePage,
     });
 
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-large-print-letter-template/${routingConfigs.valid.id}`
+      `${baseURL}/templates/message-plans/choose-large-print-letter-template/${routingConfigs.valid.id}?lockNumber=${routingConfigs.valid.lockNumber}`
     );
 
     await expect(chooseLargePrintLetterTemplatePage.messagePlanName).toHaveText(
       routingConfigs.valid.name
     );
 
     await expect(chooseLargePrintLetterTemplatePage.pageHeading).toHaveText(
-      'Choose large print letter template'
+      'Choose a large print letter template'
     );
 
     const table = chooseLargePrintLetterTemplatePage.templatesTable;
@@ -276,9 +277,9 @@ test.describe('Routing - Choose large print letter template page', () => {
 
     await expect(chooseLargePrintLetterTemplatePage.errorSummary).toBeVisible();
 
-    await expect(chooseLargePrintLetterTemplatePage.errorSummary).toHaveText(
-      'You have not chosen a template'
-    );
+    await expect(
+      chooseLargePrintLetterTemplatePage.errorSummaryHint
+    ).toHaveText('You have not chosen a template');
 
     const errorLink =
       chooseLargePrintLetterTemplatePage.errorSummaryList.first();

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

@@ -41,8 +41,9 @@ export function assertChooseTemplatePageWithNoTemplates({
     );
 
     await expect(page.backLinkBottom).toBeVisible();
-    expect(page.backLinkBottom.getAttribute('href')).toContain(
-      '/templates/message-plans/choose-templates'
+    await expect(page.backLinkBottom).toHaveAttribute(
+      'href',
+      expect.stringContaining('/templates/message-plans/choose-templates')
     );
 
     await expect(page.templatesTable).toBeHidden();