CCM-11886: Fix tests

Author: chris-elliott-nhsd

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

@@ -21,7 +21,11 @@ export const TemplateFactory = {
     });
   },
 
-  createSmsTemplate: (id: string, user: TestUser, name: string = 'test'): Template => {
+  createSmsTemplate: (
+    id: string,
+    user: TestUser,
+    name: string = 'test'
+  ): Template => {
     return TemplateFactory.create({
       campaignId: testClients[user.clientKey]?.campaignId,
       clientId: user.clientId,
@@ -33,7 +37,11 @@ export const TemplateFactory = {
     });
   },
 
-  createNhsAppTemplate: (id: string, user: TestUser, name: string = 'test'): Template => {
+  createNhsAppTemplate: (
+    id: string,
+    user: TestUser,
+    name: string = 'test'
+  ): Template => {
     return TemplateFactory.create({
       campaignId: testClients[user.clientKey]?.campaignId,
       clientId: user.clientId,
@@ -68,6 +76,7 @@ export const TemplateFactory = {
         },
         proofs: {},
       },
+      personalisationParameters: [],
       id,
       language: 'en',
       letterType: 'x0',

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

@@ -20,27 +20,28 @@ function createTemplates(user: TestUser) {
     valid: TemplateFactory.createEmailTemplate(
       'f26a6c9b-29f5-4280-9b8d-aa692f0aa8aa',
       user,
-      'edit-email-page-valid',
+      'edit-email-page-valid'
     ),
     submit: TemplateFactory.createEmailTemplate(
       '29252087-fbfa-459d-9c05-577223a94ad9',
       user,
-      'edit-email-page-submit',
+      'edit-email-page-submit'
     ),
     submitAndReturn: TemplateFactory.createEmailTemplate(
       '2965e999-27d9-48a6-9bed-251c141ce778',
       user,
-      'edit-email-page-submit-and-return',
+      'edit-email-page-submit-and-return'
     ),
     goBackAndReturn: TemplateFactory.createEmailTemplate(
       '66e0051e-c201-4ec7-a318-999b4c63d3b9',
       user,
-      'edit-email-page-go-back-and-return',
+      'edit-email-page-go-back-and-return'
     ),
     noEmailTemplateType: TemplateFactory.create({
       id: 'e61c935f-d4ef-4bd7-b09e-3cdc6cb5923f',
       templateType: 'NHS_APP',
       name: 'no-email-template-type-template',
+      message: 'no-email-template-type-template-message',
       owner: `CLIENT#${user.clientId}`,
       clientId: user.clientId,
     }),

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

@@ -25,7 +25,7 @@ function createTemplates(user: TestUser) {
       ...TemplateFactory.createEmailTemplate(
         '21f984dd-9701-466e-a166-0afeafd0a23f',
         user,
-        'valid-email-template-preview-submitted',
+        'valid-email-template-preview-submitted'
       ),
       subject: 'test-template-subject-line',
       message: 'test-template-message',
@@ -35,7 +35,7 @@ function createTemplates(user: TestUser) {
       ...TemplateFactory.createEmailTemplate(
         '201e913d-1c21-4069-a04c-a7760b3dd602',
         user,
-        'invalid-email-template-preview-submitted',
+        'invalid-email-template-preview-submitted'
       ),
       subject: 'test-template-subject-line',
       message: 'test-template-message',

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

@@ -22,7 +22,7 @@ async function createTemplates() {
   const user = await createAuthHelper().getTestUser(testUsers.User1.userId);
   return {
     empty: {
-      id: 'preview-page-invalid-nhs-app-template',
+      id: 'c9a43c53-a523-4431-b1cd-60fc7ba183d6',
       version: 1,
       createdAt: new Date().toISOString(),
       updatedAt: new Date().toISOString(),
@@ -34,7 +34,7 @@ async function createTemplates() {
       ...TemplateFactory.createNhsAppTemplate(
         '825c809a-e781-4085-984b-90dc620947ba',
         user,
-        'valid-nhs-app-preview-template',
+        'valid-nhs-app-preview-template'
       ),
       message: 'test-template-message',
     },

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

@@ -34,7 +34,7 @@ function createTemplates(user: TestUser) {
       ...TemplateFactory.createNhsAppTemplate(
         'a0a0d4c9-e18d-4aa9-8973-336a66fbadde',
         user,
-        'invalid-nhs-app-template-preview-submitted',
+        'invalid-nhs-app-template-preview-submitted'
       ),
       message: 'test-template-message',
       templateStatus: 'NOT_YET_SUBMITTED',

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

@@ -21,29 +21,30 @@ function createTemplates(user: TestUser) {
     valid: TemplateFactory.createSmsTemplate(
       '578d292e-a4ae-411a-a7be-c2f1228b6459',
       user,
-      'edit-sms-page-valid',
+      'edit-sms-page-valid'
     ),
     submit: TemplateFactory.createSmsTemplate(
       '5b10cafb-ee25-47b6-85eb-540d7dc127b7',
       user,
-      'edit-sms-page-submit',
+      'edit-sms-page-submit'
     ),
     submitAndReturn: TemplateFactory.createSmsTemplate(
       '4a3fd84b-0685-4197-91ed-c058acbe1a61',
       user,
-      'edit-sms-page-submit-and-return',
+      'edit-sms-page-submit-and-return'
     ),
     goBackAndReturn: TemplateFactory.createSmsTemplate(
       '5f04230c-21df-4869-a911-7673f3b908fe',
       user,
-      'edit-sms-page-go-back-and-return',
+      'edit-sms-page-go-back-and-return'
     ),
     noSmsTemplateType: TemplateFactory.create({
       id: 'be8a4618-17e5-45c4-855b-c91d55a3ff66',
       templateType: 'EMAIL',
       owner: `CLIENT#${user.clientId}`,
       clientId: user.clientId,
       name: 'no-sms-template-type-template',
+      message: 'no-sms-template-type-template-message',
     }),
     previousData: {
       ...TemplateFactory.createSmsTemplate(

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

@@ -33,7 +33,7 @@ async function createTemplates() {
     valid: {
       ...TemplateFactory.createSmsTemplate(
         '7f41fb5b-7f59-448c-8037-f37c25466455',
-        user,
+        user
       ),
       name: 'valid-sms-preview-template',
       message: 'test-template-message',

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

@@ -24,7 +24,7 @@ async function createTemplates() {
   return {
     email: {
       empty: {
-        id: 'submit-page-invalid-email-template',
+        id: '8cc45601-6ac7-494c-a462-058e549e6e64',
         version: 1,
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
@@ -76,23 +76,23 @@ async function createTemplates() {
           user
         ),
         name: 'submit-sms-submit-template',
-        message: 'test-template-message'
+        message: 'test-template-message',
       },
       submitAndReturn: {
         ...TemplateFactory.createSmsTemplate(
           'a021ca73-674d-44e7-b48d-b7c1e5514fb5',
           user
         ),
         name: 'submit-and-return-sms-template',
-        message: 'test-template-message'
+        message: 'test-template-message',
       },
       valid: {
         ...TemplateFactory.createSmsTemplate(
           '2a37b26c-4e17-436c-a7b6-97ca1a465e91',
           user
         ),
         name: 'valid-sms-submit-template',
-        message: 'test-template-message'
+        message: 'test-template-message',
       },
     },
     'nhs-app': {
@@ -111,23 +111,23 @@ async function createTemplates() {
           user
         ),
         name: 'submit-nhs-app-submit-template',
-        message: 'test-template-message'
+        message: 'test-template-message',
       },
       submitAndReturn: {
         ...TemplateFactory.createNhsAppTemplate(
           '395d640b-610a-49bb-9fcd-0f42c521d5fc',
           user
         ),
         name: 'submit-and-return-nhs-app-template',
-        message: 'test-template-message'
+        message: 'test-template-message',
       },
       valid: {
         ...TemplateFactory.createNhsAppTemplate(
           '1e0dbdd6-d662-42d8-965c-03b8e331458d',
           user
         ),
         name: 'valid-nhs-app-submit-template',
-        message: 'test-template-message'
+        message: 'test-template-message',
       },
     },
     letter: {

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

@@ -35,7 +35,7 @@ function createTemplates(user: TestUser) {
       ...TemplateFactory.createSmsTemplate(
         'a17074b5-8936-48b2-b3d6-d5aec045c538',
         user,
-        'submitted-page-sms-template',
+        'submitted-page-sms-template'
       ),
       templateStatus: 'SUBMITTED',
       message: 'test example content',
@@ -44,7 +44,7 @@ function createTemplates(user: TestUser) {
       ...TemplateFactory.createNhsAppTemplate(
         'bc924b01-d395-4037-906a-7aae3c660bf4',
         user,
-        'submitted-page-nhs-app-template',
+        'submitted-page-nhs-app-template'
       ),
       templateStatus: 'SUBMITTED',
       message: 'test example content',

tests/test-team/template-mgmt-component-tests/template-unauthorised-data.component.spec.ts

@@ -30,13 +30,6 @@ function createTemplates(user: TestUser) {
       'd78fae9f-5cf3-4e22-8adb-9be7f35c9d1c',
       user
     ),
-    noEmailTemplateType: TemplateFactory.create({
-      id: '431b92ab-1110-42d1-8764-ded5cefb14fc',
-      templateType: 'NHS_APP',
-      owner: `CLIENT#${user.clientId}`,
-      clientId: user.clientId,
-      name: 'no-email-template-type-template-name',
-    }),
     previousData: {
       ...TemplateFactory.createEmailTemplate(
         'a5f0bc02-6949-4c8f-9c42-f163d62ee335',