fix component tests

Author: alexnuttall

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

@@ -41,12 +41,14 @@ export const TemplateFactory = {
     id: string,
     owner: string,
     name: string,
-    virusScanStatus = 'PENDING'
+    templateStatus = 'NOT_YET_SUBMITTED',
+    virusScanStatus = 'PASSED'
   ): Template => {
     return TemplateFactory.create({
       id,
       owner,
       name,
+      templateStatus,
       templateType: 'LETTER',
       letterType: 'x0',
       language: 'en',

tests/test-team/template-mgmt-api-tests/request-proof.api.spec.ts

@@ -63,15 +63,12 @@ test.describe('POST /v1/template/:templateId/proof @debug', () => {
     const user1templateId = randomUUID();
 
     await templateStorageHelper.seedTemplateData([
-      {
-        ...TemplateFactory.createLetterTemplate(
-          user1templateId,
-          user1.userId,
-          'user1template',
-          'PASSED'
-        ),
-        templateStatus: 'PENDING_PROOF_REQUEST',
-      },
+      TemplateFactory.createLetterTemplate(
+        user1templateId,
+        user1.userId,
+        'user1template',
+        'PENDING_PROOF_REQUEST'
+      ),
     ]);
 
     const updateResponse = await request.post(
@@ -101,9 +98,9 @@ test.describe('POST /v1/template/:templateId/proof @debug', () => {
       ...TemplateFactory.createLetterTemplate(
         templateId,
         user1.userId,
-        'user1template'
+        'user1template',
+        'PENDING_PROOF_REQUEST'
       ),
-      templateStatus: 'PENDING_PROOF_REQUEST',
       files: {
         pdfTemplate: {
           virusScanStatus: 'PASSED',
@@ -161,9 +158,9 @@ test.describe('POST /v1/template/:templateId/proof @debug', () => {
       ...TemplateFactory.createLetterTemplate(
         templateId,
         user1.userId,
-        'user1template'
+        'user1template',
+        'PENDING_VALIDATION'
       ),
-      templateStatus: 'PENDING_VALIDATION',
       files: {
         pdfTemplate: {
           virusScanStatus: 'PASSED',

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

@@ -25,17 +25,20 @@ async function createTemplates() {
     notYetSubmitted: TemplateFactory.createLetterTemplate(
       '9AACCD57-C6A3-4273-854C-3839A081B4D9',
       user.userId,
-      'notYetSubmitted'
+      'notYetSubmitted',
+      'NOT_YET_SUBMITTED'
     ),
     pendingProofRequest: TemplateFactory.createLetterTemplate(
       '10AE654B-72B5-4A67-913C-2E103C7FF47B',
       user.userId,
-      'pendingProofRequest'
+      'pendingProofRequest',
+      'PENDING_PROOF_REQUEST'
     ),
     pendingUpload: TemplateFactory.createLetterTemplate(
-      '10AE654B-72B5-4A67-913C-2E103C7FF47B',
+      '5C442DA9-B555-4CEA-AFE9-143851FD210B',
       user.userId,
-      'pendingUpload'
+      'pendingUpload',
+      'PENDING_UPLOAD'
     ),
   };
 }

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

@@ -20,23 +20,19 @@ import {
 
 function createTemplates(owner: string) {
   return {
-    valid: {
-      ...TemplateFactory.createLetterTemplate(
-        'valid-email-template-preview-submitted',
-        owner,
-        'valid-email-template-preview-submitted'
-      ),
-      name: 'test-template-letter',
-      templateStatus: 'SUBMITTED',
-    },
+    valid: TemplateFactory.createLetterTemplate(
+      'valid-letter-template-preview-submitted',
+      owner,
+      'valid-email-template-preview-submitted',
+      'SUBMITTED'
+    ),
     invalid: {
       ...TemplateFactory.createLetterTemplate(
         'invalid-letter-template-preview-submitted',
         owner,
-        'invalid-letter-template-preview-submitted'
+        'invalid-letter-template-preview-submitted',
+        'NOT_A_STATUS'
       ),
-      name: 'test-template-letter',
-      templateStatus: 'NOT_YET_SUBMITTED',
     },
   };
 }
@@ -69,7 +65,7 @@ test.describe('Preview submitted Letter message template Page', () => {
     );
 
     await expect(previewSubmittedLetterTemplatePage.pageHeader).toContainText(
-      'test-template-letter'
+      templates.valid.name
     );
   });
 

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

@@ -38,13 +38,11 @@ function createTemplates(owner: string) {
       name: 'app-template-copy-page-name',
       message: 'app-template-copy-page-message',
     },
-    letter: {
-      ...TemplateFactory.createLetterTemplate(
-        'letter-template-copy-page',
-        owner,
-        'letter-template-copy-page-name'
-      ),
-    },
+    letter: TemplateFactory.createLetterTemplate(
+      'letter-template-copy-page',
+      owner,
+      'letter-template-copy-page-name'
+    ),
   };
 }
 

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

@@ -32,13 +32,11 @@ function createTemplates(owner: string) {
       message: 'delete-page-confirm-email-message',
       subject: 'template-subject',
     },
-    confirmLetter: {
-      ...TemplateFactory.createLetterTemplate(
-        'delete-page-confirm-letter',
-        owner,
-        'delete-page-confirm-letter-name'
-      ),
-    },
+    confirmLetter: TemplateFactory.createLetterTemplate(
+      'delete-page-confirm-letter',
+      owner,
+      'delete-page-confirm-letter-name'
+    ),
   };
 }
 

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

@@ -147,20 +147,17 @@ async function createTemplates() {
       submit: TemplateFactory.createLetterTemplate(
         'submit-letter-submit-template',
         user.userId,
-        'test-template-name',
-        'PASSED'
+        'test-template-name'
       ),
       submitAndReturn: TemplateFactory.createLetterTemplate(
         'submit-and-return-letter-template',
         user.userId,
-        'test-template-name',
-        'PASSED'
+        'test-template-name'
       ),
       valid: TemplateFactory.createLetterTemplate(
         'valid-letter-submit-template',
         user.userId,
-        'test-template-name',
-        'PASSED'
+        'test-template-name'
       ),
     },
   };

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

@@ -45,15 +45,13 @@ function createTemplates(owner: string) {
       name: 'test-template-nhs-app',
       message: 'test example content',
     }),
-    letter: {
-      ...TemplateFactory.createLetterTemplate(
-        'valid-submitted-letter-template',
-        owner,
-        'test-template-letter',
-        'PASSED'
-      ),
-      templateStatus: 'SUBMITTED',
-    },
+    letter: TemplateFactory.createLetterTemplate(
+      'valid-submitted-letter-template',
+      owner,
+      'test-template-letter',
+      'SUBMITTED',
+      'PASSED'
+    ),
   };
 }
 

tests/test-team/template-mgmt-e2e-tests/template-mgmt-sftp-send-proof.e2e.spec.ts

@@ -74,9 +74,8 @@ test.describe('SFTP proof send', () => {
         templateId,
         user.userId,
         'send-proof-letter',
-        'PASSED'
+        'PENDING_PROOF_REQUEST'
       ),
-      templateStatus: 'PENDING_PROOF_REQUEST',
       // the template's 'personalisationParameters' has no effect on the test
       // the sender lambda does not read the template
       personalisationParameters,