CCM-8961: Fix integration test letter template creation

Author: ClareJonesBJSS

frontend/src/components/molecules/MessageTemplates/MessageTemplates.tsx

@@ -13,7 +13,6 @@ import {
   templateStatusToDisplayMappings,
   templateTypeDisplayMappings,
   previewSubmittedTemplatePages,
-  templateStatusToColourMappings,
 } from 'nhs-notify-web-template-management-utils';
 import { TemplateDto } from 'nhs-notify-backend-client';
 import style from './MessageTemplates.module.scss';

tests/test-team/helpers/factories/template-factory.ts

@@ -76,7 +76,7 @@ export const TemplateFactory = {
     }
   ): Template => {
     return {
-      templateStatus: 'PENDING_UPLOAD',
+      templateStatus: 'NOT_YET_SUBMITTED',
       version: 1,
       createdAt: new Date().toISOString(),
       updatedAt: new Date().toISOString(),

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

@@ -44,19 +44,22 @@ async function createTemplates() {
       'pending-letter-preview-template',
       user.userId,
       'test-pending-template-letter',
-      'PENDING_UPLOAD'
+      'PENDING_UPLOAD',
+      'PENDING'
     ),
     virus: TemplateFactory.createLetterTemplate(
       'virus-letter-preview-template',
       user.userId,
       'test-virus-template-letter',
-      'VIRUS_SCAN_FAILED'
+      'VIRUS_SCAN_FAILED',
+      'FAILED'
     ),
     invalid: TemplateFactory.createLetterTemplate(
       'invalid-letter-preview-template',
       user.userId,
       'test-invalid-template-letter',
-      'VALIDATION_FAILED'
+      'VALIDATION_FAILED',
+      'PASSED'
     ),
   };
 }

tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-file-validation.e2e.spec.ts

@@ -109,7 +109,7 @@ test.describe('letter file validation', () => {
     page.reload();
 
     await expect(page.locator('.nhsuk-error-summary')).toBeHidden();
-    await expect(page.getByTestId('submit-button')).toBeVisible();
+    await expect(page.getByTestId('preview-letter-template-cta')).toBeVisible();
   });
 
   test('PDF only - Uploaded pdf file is virus scanned - if scan passes, file is copied to the internal bucket and validated', async ({
@@ -179,7 +179,7 @@ test.describe('letter file validation', () => {
     page.reload();
 
     await expect(page.locator('.nhsuk-error-summary')).toBeHidden();
-    await expect(page.getByTestId('submit-button')).toBeVisible();
+    await expect(page.getByTestId('preview-letter-template-cta')).toBeVisible();
   });
 
   test('Uploaded pdf template files and test data csv files are virus scanned - if threat detected, files are deleted from quarantine and not copied, file and template status updated in database', async ({
@@ -256,7 +256,7 @@ test.describe('letter file validation', () => {
     page.reload();
 
     await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
-    await expect(page.getByTestId('submit-button')).toBeHidden();
+    await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
   });
 
   test('Uploaded pdf template files and test data csv files are virus scanned - if password protected, files are deleted from quarantine and not copied, file and template status updated in database', async ({
@@ -330,7 +330,7 @@ test.describe('letter file validation', () => {
     page.reload();
 
     await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
-    await expect(page.getByTestId('submit-button')).toBeHidden();
+    await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
   });
 
   test('validation fails if pdf parameters and test data parameters do not match', async ({
@@ -385,7 +385,7 @@ test.describe('letter file validation', () => {
     page.reload();
 
     await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
-    await expect(page.getByTestId('submit-button')).toBeHidden();
+    await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
   });
 
   test('validation fails if unexpected csv is uploaded', async ({ page }) => {
@@ -438,7 +438,7 @@ test.describe('letter file validation', () => {
     page.reload();
 
     await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
-    await expect(page.getByTestId('submit-button')).toBeHidden();
+    await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
   });
 
   test('validation fails if expected csv is not uploaded', async ({ page }) => {
@@ -486,7 +486,7 @@ test.describe('letter file validation', () => {
     page.reload();
 
     await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
-    await expect(page.getByTestId('submit-button')).toBeHidden();
+    await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
   });
 
   test('validation fails if pdf has incomplete address', async ({ page }) => {
@@ -534,7 +534,7 @@ test.describe('letter file validation', () => {
     page.reload();
 
     await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
-    await expect(page.getByTestId('submit-button')).toBeHidden();
+    await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
   });
 
   test('validation fails if pdf has empty parameters', async ({ page }) => {
@@ -587,7 +587,7 @@ test.describe('letter file validation', () => {
     page.reload();
 
     await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
-    await expect(page.getByTestId('submit-button')).toBeHidden();
+    await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
   });
 
   test('validation fails if pdf has non-sensible parameters', async ({
@@ -642,6 +642,6 @@ test.describe('letter file validation', () => {
     page.reload();
 
     await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
-    await expect(page.getByTestId('submit-button')).toBeHidden();
+    await expect(page.getByTestId('preview-letter-template-cta')).toBeHidden();
   });
 });

utils/utils/src/__tests__/enum.test.ts

@@ -105,22 +105,6 @@ describe('alphabeticalLanguageList', () => {
   });
 });
 
-describe('templateStatusToColourMappings', () => {
-  test('NOT_YET_SUBMITTED', () => {
-    expect(templateStatusToColourMappings('NOT_YET_SUBMITTED')).toEqual(
-      undefined
-    );
-  });
-
-  test('SUBMITTED', () => {
-    expect(templateStatusToColourMappings('SUBMITTED')).toEqual('grey');
-  });
-
-  test('VIRUS_SCAN_FAILED', () => {
-    expect(templateStatusToColourMappings('VIRUS_SCAN_FAILED')).toEqual('red');
-  });
-});
-
 describe('templateStatusToDisplayMappings', () => {
   test('NOT_YET_SUBMITTED', () => {
     expect(templateStatusToDisplayMappings('NOT_YET_SUBMITTED')).toEqual(