CCM-10893 Update tests

Author: nicki-nhs

frontend/src/__tests__/components/molecules/Header.test.tsx

@@ -21,7 +21,7 @@ describe('Header component', () => {
   it('should contain an authentication link', () => {
     render(<NHSNotifyHeader />);
 
-    expect(screen.getByTestId('auth-link')).toBeInTheDocument();
+    expect(screen.getByTestId('sign-in-link')).toBeInTheDocument();
   });
 
   it('should render correctly', () => {

frontend/src/__tests__/components/molecules/HeaderWithAccount.test.tsx

@@ -56,7 +56,7 @@ describe('NhsNotifyHeaderWithAccount', () => {
     it(`renders the authentication link as 'sign in'`, async () => {
       render(<NhsNotifyHeaderWithAccount />);
 
-      expect(await screen.findByTestId('auth-link')).toHaveTextContent(
+      expect(await screen.findByTestId('sign-in-link')).toHaveTextContent(
         'Sign in'
       );
     });
@@ -116,7 +116,7 @@ describe('NhsNotifyHeaderWithAccount', () => {
     it(`renders auth link as 'Sign out'`, async () => {
       render(<NhsNotifyHeaderWithAccount />);
 
-      expect(await screen.findByTestId('auth-link')).toHaveTextContent(
+      expect(await screen.findByTestId('sign-out-link')).toHaveTextContent(
         'Sign out'
       );
     });

frontend/src/__tests__/components/molecules/__snapshots__/AuthLink.test.tsx.snap

@@ -4,7 +4,7 @@ exports[`AuthLink renders Sign in link when authStatus is configuring 1`] = `
 <DocumentFragment>
   <a
     class="auth-link"
-    data-testid="auth-link"
+    data-testid="sign-in-link"
     href="/auth?redirect=%2Ftemplates%2Fcreate-and-submit-templates"
     id="sign-in-link"
   >
@@ -17,7 +17,7 @@ exports[`AuthLink renders Sign in link when authStatus is unauthenticated 1`] =
 <DocumentFragment>
   <a
     class="auth-link"
-    data-testid="auth-link"
+    data-testid="sign-in-link"
     href="/auth?redirect=%2Ftemplates%2Fcreate-and-submit-templates"
     id="sign-in-link"
   >
@@ -30,7 +30,7 @@ exports[`AuthLink renders Sign out link when authStatus is authenticated 1`] = `
 <DocumentFragment>
   <a
     class="auth-link"
-    data-testid="auth-link"
+    data-testid="sign-out-link"
     href="/auth/signout"
     id="sign-out-link"
   >

frontend/src/__tests__/components/molecules/__snapshots__/Header.test.tsx.snap

@@ -54,7 +54,7 @@ exports[`Header component should render correctly 1`] = `
       >
         <a
           class="auth-link"
-          data-testid="auth-link"
+          data-testid="sign-in-link"
           href="/auth?redirect=%2Ftemplates%2Fcreate-and-submit-templates"
           id="sign-in-link"
         >

frontend/src/__tests__/components/molecules/__snapshots__/HeaderWithAccount.test.tsx.snap

@@ -79,7 +79,7 @@ exports[`NhsNotifyHeaderWithAccount when authenticated matches snapshot (authent
           >
             <a
               class="auth-link nhsuk-header__account-link"
-              data-testid="auth-link"
+              data-testid="sign-out-link"
               href="/auth/signout"
               id="sign-out-link"
             >
@@ -173,7 +173,7 @@ exports[`NhsNotifyHeaderWithAccount when unauthenticated matches snapshot (unaut
           >
             <a
               class="auth-link nhsuk-header__account-link"
-              data-testid="auth-link"
+              data-testid="sign-in-link"
               href="/auth?redirect=%2Ftemplates%2Fcreate-and-submit-templates"
               id="sign-in-link"
             >

frontend/src/components/molecules/AuthLink/AuthLink.tsx

@@ -21,7 +21,7 @@ export const AuthLink = ({ className }: { className?: string }) => {
     <a
       id={id}
       className={classNames(styles['auth-link'], className)}
-      data-testid='auth-link'
+      data-testid={id}
       href={linkContent.href}
     >
       {linkContent.text}

tests/test-team/helpers/client/client-helper.ts

@@ -7,6 +7,7 @@ import {
 type ClientConfiguration = {
   features: {
     proofing: boolean;
+    routing: boolean;
   };
   campaignId?: string;
 };
@@ -20,21 +21,23 @@ type TestClients = Record<
 
 export const testClients = {
   /**
-   * Client1 has proofing enabled
+   * Client1 has proofing and routing enabled
    */
   Client1: {
     campaignId: 'Campaign1',
     features: {
       proofing: true,
+      routing: true,
     },
   },
   /**
-   * Client2 has proofing disabled
+   * Client2 has proofing and routing disabled
    */
   Client2: {
     campaignId: 'Campaign2',
     features: {
       proofing: false,
+      routing: false,
     },
   },
   /**
@@ -48,6 +51,7 @@ export const testClients = {
     campaignId: undefined,
     features: {
       proofing: false,
+      routing: false,
     },
   },
 } satisfies TestClients as TestClients & { NONE: undefined };
@@ -58,7 +62,7 @@ export class ClientConfigurationHelper {
   constructor(
     private readonly clientSSMKeyPrefix: string,
     private readonly runId: string
-  ) {}
+  ) { }
 
   async setup() {
     return Promise.all(

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

@@ -7,15 +7,23 @@ export abstract class TemplateMgmtBasePage {
 
   static readonly pageUrlSegment: string;
 
-  readonly notifyBannerLink: Locator;
+  readonly header: Locator;
+
+  readonly headerLogoLink: Locator;
+
+  readonly headerAccountDisplayName: Locator;
+
+  readonly headerAccountClientName: Locator;
 
   readonly signInLink: Locator;
 
   readonly signOutLink: Locator;
 
+  readonly headerNavigationLinks: Locator;
+
   readonly goBackLink: Locator;
 
-  readonly pageHeader: Locator;
+  readonly pageHeading: Locator;
 
   readonly errorSummary: Locator;
 
@@ -28,23 +36,22 @@ export abstract class TemplateMgmtBasePage {
   constructor(page: Page) {
     this.page = page;
 
-    this.notifyBannerLink = page.locator(
-      '[class="nhsuk-header__link nhsuk-header__link--service"]'
-    );
+    this.header = page.getByTestId('page-header');
+    this.headerLogoLink = page.getByTestId('header-logo-service-link');
+
+    this.headerAccountDisplayName = page.getByTestId('account-display-name');
+    this.headerAccountClientName = page.getByTestId('account-client-name');
 
-    this.signInLink = page
-      .locator('[data-testid="auth-link"]')
-      .and(page.getByText('Sign in'));
+    this.signInLink = page.getByTestId('sign-in-link');
+    this.signOutLink = page.getByTestId('sign-out-link');
 
-    this.signOutLink = page
-      .locator('[data-testid="auth-link"]')
-      .and(page.getByText('Sign out'));
+    this.headerNavigationLinks = page.getByTestId('navigation-links');
 
     this.goBackLink = page
       .locator('.nhsuk-back-link__link')
       .and(page.getByText('Go back'));
 
-    this.pageHeader = page.getByRole('heading', { level: 1 });
+    this.pageHeading = page.getByRole('heading', { level: 1 });
 
     this.errorSummary = page.getByRole('alert', { name: 'There is a problem' });
 
@@ -66,8 +73,8 @@ export abstract class TemplateMgmtBasePage {
     await this.page.goto(url);
   }
 
-  async clickNotifyBannerLink() {
-    await this.notifyBannerLink.click();
+  async clickHeaderLogoLink() {
+    await this.headerLogoLink.click();
   }
 
   async clickSignInLink() {

tests/test-team/template-mgmt-component-tests/email/template-mgmt-create-email-page.component.spec.ts

@@ -5,7 +5,7 @@ import {
   assertFooterLinks,
   assertGoBackLink,
   assertSignOutLink,
-  assertNotifyBannerLink,
+  assertHeaderLogoLink,
   assertSkipToMainContent,
 } from '../template-mgmt-common.steps';
 import {
@@ -36,7 +36,7 @@ test.describe('Create Email message template Page', () => {
 
     await expect(page).toHaveURL(`${baseURL}/templates/create-email-template`);
 
-    await expect(createEmailTemplatePage.pageHeader).toHaveText(
+    await expect(createEmailTemplatePage.pageHeading).toHaveText(
       'Create email template'
     );
   });
@@ -49,7 +49,7 @@ test.describe('Create Email message template Page', () => {
       };
 
       await assertSkipToMainContent(props);
-      await assertNotifyBannerLink(props);
+      await assertHeaderLogoLink(props);
       await assertSignOutLink(props);
       await assertFooterLinks(props);
       await assertGoBackLink({

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

@@ -6,7 +6,7 @@ import {
   assertFooterLinks,
   assertSignOutLink,
   assertGoBackLinkNotPresent,
-  assertNotifyBannerLink,
+  assertHeaderLogoLink,
   assertSkipToMainContent,
 } from '../template-mgmt-common.steps';
 import {
@@ -72,7 +72,7 @@ test.describe('Edit Email message template Page', () => {
       `${baseURL}/templates/edit-email-template/${templates.valid.id}`
     );
 
-    await expect(editEmailTemplatePage.pageHeader).toHaveText(
+    await expect(editEmailTemplatePage.pageHeading).toHaveText(
       'Edit email template'
     );
   });
@@ -86,7 +86,7 @@ test.describe('Edit Email message template Page', () => {
       };
 
       await assertSkipToMainContent(props);
-      await assertNotifyBannerLink(props);
+      await assertHeaderLogoLink(props);
       await assertSignOutLink(props);
       await assertFooterLinks(props);
       await assertGoBackLinkNotPresent(props);