Merge branch 'main' of https://github.com/NHSDigital/nhs-notify-web-template-management into feature/CCM-11544-multiple-language-templates

Author: nicki-nhs

.github/workflows/pr_destroy_dynamic_env.yaml

@@ -3,6 +3,8 @@ name: PR Destroy Environment
 on:
   pull_request:
     types: [closed]
+    branches:
+      - '*'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/stage-2-test.yaml

@@ -86,7 +86,9 @@ jobs:
       - name: "Restore node_modules from cache"
         uses: ./.github/actions/node-modules-cache
         with:
-          node_version: "${{ inputs.nodejs_version }}"
+        # Pinned Node version for running unit tests to ensure that coverage checks work as expected
+        # Long term fix covered in CCM-9959
+          node_version: "22.21.1"
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present

frontend/src/__tests__/app/create-nhs-app-template/page.test.tsx

@@ -9,6 +9,7 @@ import content from '@content/content';
 const { pageTitle } = content.components.templateFormNhsApp;
 
 jest.mock('@forms/NhsAppTemplateForm/NhsAppTemplateForm');
+jest.mock('nhs-notify-web-template-management-utils/logger');
 
 describe('CreateNHSAppTemplatePage', () => {
   beforeEach(jest.resetAllMocks);

frontend/src/__tests__/app/create-text-message-template/page.test.tsx

@@ -9,6 +9,7 @@ import content from '@content/content';
 const { pageTitle } = content.components.templateFormSms;
 
 jest.mock('@forms/SmsTemplateForm/SmsTemplateForm');
+jest.mock('nhs-notify-web-template-management-utils/logger');
 
 describe('CreateSMSTemplatePage', () => {
   beforeEach(jest.resetAllMocks);

frontend/src/__tests__/app/message-plans/edit-message-plan-settings/page.test.tsx

@@ -23,13 +23,21 @@ const routingConfig = RoutingConfigFactory.create({
   campaignId: 'aff79ee0-4481-4fa3-8a1a-0df53c7b41e5',
 });
 
+const errorLogger = console.error;
+
 beforeAll(() => {
   jest.mocked(redirect).mockImplementation((url, type) => {
     throw new NextRedirectError(url, type);
   });
   jest.mocked(getRoutingConfig).mockResolvedValue(routingConfig);
   jest.mocked(fetchClient).mockResolvedValue({ features: {}, campaignIds: [] });
   jest.mocked(verifyFormCsrfToken).mockResolvedValue(true);
+  global.console.error = jest.fn(); // suppress error logging in expected error tests
+});
+
+afterAll(() => {
+  jest.resetAllMocks();
+  global.console.error = errorLogger;
 });
 
 beforeEach(() => {

frontend/src/__tests__/components/forms/CopyTemplate/CopyTemplate.test.tsx

@@ -8,6 +8,7 @@ import { TemplateFormState } from 'nhs-notify-web-template-management-utils';
 import { TemplateDto } from 'nhs-notify-backend-client';
 
 jest.mock('@utils/amplify-utils');
+jest.mock('nhs-notify-web-template-management-utils/logger');
 
 jest.mock('react', () => {
   const originalModule = jest.requireActual('react');

frontend/src/__tests__/components/forms/EmailTemplateForm/EmailTemplateForm.test.tsx

@@ -23,6 +23,17 @@ jest.mock('react', () => {
   };
 });
 
+const errorLogger = console.error;
+
+beforeAll(() => {
+  global.console.error = jest.fn(); // suppress error logging in tests
+});
+
+afterAll(() => {
+  jest.resetAllMocks();
+  global.console.error = errorLogger;
+});
+
 test('renders page with preloaded field values', () => {
   const container = render(
     <EmailTemplateForm

frontend/src/__tests__/components/forms/NhsAppTemplateForm/NhsAppTemplateForm.test.tsx

@@ -24,6 +24,17 @@ jest.mock('react', () => {
   };
 });
 
+const errorLogger = console.error;
+
+beforeAll(() => {
+  global.console.error = jest.fn(); // suppress error logging in tests
+});
+
+afterAll(() => {
+  jest.resetAllMocks();
+  global.console.error = errorLogger;
+});
+
 test('renders page', async () => {
   const user = userEvent.setup();
 

frontend/src/__tests__/components/forms/RequestProof/server-action.test.ts

@@ -10,6 +10,7 @@ import { TemplateDto } from 'nhs-notify-backend-client';
 jest.mock('next/navigation');
 jest.mock('@utils/form-actions');
 jest.mock('@utils/amplify-utils');
+jest.mock('nhs-notify-web-template-management-utils/logger');
 
 const redirectMock = jest.mocked(redirect);
 const getTemplateMock = jest.mocked(getTemplate);

frontend/src/__tests__/components/forms/SubmitTemplate/server-action.test.ts

@@ -10,6 +10,7 @@ import { TemplateDto } from 'nhs-notify-backend-client';
 jest.mock('next/navigation');
 jest.mock('@utils/form-actions');
 jest.mock('@utils/amplify-utils');
+jest.mock('nhs-notify-web-template-management-utils/logger');
 
 const redirectMock = jest.mocked(redirect);
 const getTemplateMock = jest.mocked(getTemplate);