From a3a8c63ad78776b9ac5692c58f63197af1b941d0 Mon Sep 17 00:00:00 2001 From: NarenderRajuB Date: Sun, 9 Jun 2024 12:08:38 +0100 Subject: [PATCH 1/2] Update form name --- fsd_config/form_jsons/hsra_r1/hsra-r1-eligibility.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fsd_config/form_jsons/hsra_r1/hsra-r1-eligibility.json b/fsd_config/form_jsons/hsra_r1/hsra-r1-eligibility.json index 88b0c7978..fccae041e 100644 --- a/fsd_config/form_jsons/hsra_r1/hsra-r1-eligibility.json +++ b/fsd_config/form_jsons/hsra_r1/hsra-r1-eligibility.json @@ -690,5 +690,6 @@ "outputs": [], "version": 2, "skipSummary": false, - "markAsComplete": false + "markAsComplete": false, + "name": "Apply for funding to cover the cost of delivering a high street rental auction" } From aec8ef7e01d2cf6f539c920f9b78dba54f634912 Mon Sep 17 00:00:00 2001 From: NarenderRajuB Date: Mon, 10 Jun 2024 13:28:01 +0100 Subject: [PATCH 2/2] fix yarn tests --- .../engine/pageControllers/PageControllerBase.ts | 2 +- .../cases/server/plugins/engine/NotifyViewModel.json | 12 ++++-------- .../cases/server/plugins/engine/SaveViewModel.json | 2 +- .../server/plugins/engine/SummaryViewModel.json | 10 ++++------ .../cases/server/plugins/engine/WebhookModel.test.ts | 2 +- .../server/plugins/engine/WelshSummaryViewModel.json | 2 +- .../cases/server/services/webhookService.test.ts | 2 +- 7 files changed, 13 insertions(+), 19 deletions(-) diff --git a/runner/src/server/plugins/engine/pageControllers/PageControllerBase.ts b/runner/src/server/plugins/engine/pageControllers/PageControllerBase.ts index 2c049e9ec..1fd575b61 100644 --- a/runner/src/server/plugins/engine/pageControllers/PageControllerBase.ts +++ b/runner/src/server/plugins/engine/pageControllers/PageControllerBase.ts @@ -559,7 +559,7 @@ export class PageControllerBase { viewModel.backLink = state.callback?.returnUrl ?? progress[progress.length - 2]; - if (state["metadata"]["has_eligibility"]) { + if (state["metadata"] && state["metadata"]["has_eligibility"]) { viewModel.backLinkText = UtilHelper.getBackLinkText( true, this.model.def?.metadata?.isWelsh diff --git a/runner/test/cases/server/plugins/engine/NotifyViewModel.json b/runner/test/cases/server/plugins/engine/NotifyViewModel.json index 8ff098dee..c052d4548 100644 --- a/runner/test/cases/server/plugins/engine/NotifyViewModel.json +++ b/runner/test/cases/server/plugins/engine/NotifyViewModel.json @@ -1,5 +1,5 @@ { - "metadata": {}, + "metadata": { "has_eligibility": false }, "startPage": "/first-page", "pages": [ { @@ -104,8 +104,7 @@ "value": "aSection.caz==2" } ], - "fees": [ - ], + "fees": [], "outputs": [ { "name": "notify", @@ -118,10 +117,7 @@ "templateId": "some-template-id", "emailField": "aSection.emailAddress", "addReferencesToPersonalisation": true, - "personalisation": [ - "aSection.name", - "nameIsJen" - ], + "personalisation": ["aSection.name", "nameIsJen"], "emailReplyToIdConfiguration": [ { "emailReplyToId": "default-email-id" @@ -135,6 +131,6 @@ } ], "version": 2, - "payApiKey": {"test": "test_api_key", "production": "production_api_key"}, + "payApiKey": { "test": "test_api_key", "production": "production_api_key" }, "skipSummary": false } diff --git a/runner/test/cases/server/plugins/engine/SaveViewModel.json b/runner/test/cases/server/plugins/engine/SaveViewModel.json index c33a6439b..8cb8f4bad 100644 --- a/runner/test/cases/server/plugins/engine/SaveViewModel.json +++ b/runner/test/cases/server/plugins/engine/SaveViewModel.json @@ -1,5 +1,5 @@ { - "metadata": {}, + "metadata": { "has_eligibility": false }, "startPage": "/first-page", "pages": [ { diff --git a/runner/test/cases/server/plugins/engine/SummaryViewModel.json b/runner/test/cases/server/plugins/engine/SummaryViewModel.json index f7738d4f1..a8cf1bce6 100644 --- a/runner/test/cases/server/plugins/engine/SummaryViewModel.json +++ b/runner/test/cases/server/plugins/engine/SummaryViewModel.json @@ -1,5 +1,5 @@ { - "metadata": {}, + "metadata": { "has_eligibility": false }, "startPage": "/first-page", "pages": [ { @@ -103,10 +103,8 @@ "title": "Named Section" } ], - "conditions": [ - ], - "fees": [ - ], + "conditions": [], + "fees": [], "outputs": [ { "name": "webhook", @@ -118,6 +116,6 @@ } ], "version": 2, - "payApiKey": {"test": "test_api_key", "production": "production_api_key"}, + "payApiKey": { "test": "test_api_key", "production": "production_api_key" }, "skipSummary": false } diff --git a/runner/test/cases/server/plugins/engine/WebhookModel.test.ts b/runner/test/cases/server/plugins/engine/WebhookModel.test.ts index fc776b58e..bb0b44cc5 100644 --- a/runner/test/cases/server/plugins/engine/WebhookModel.test.ts +++ b/runner/test/cases/server/plugins/engine/WebhookModel.test.ts @@ -143,7 +143,7 @@ suite("WebhookModel", () => { formModel ); expect(parsed).to.equal({ - metadata: {}, + metadata: { has_eligibility: false }, name: "My Service", questions: [ { diff --git a/runner/test/cases/server/plugins/engine/WelshSummaryViewModel.json b/runner/test/cases/server/plugins/engine/WelshSummaryViewModel.json index 7dc1dc5c0..80389f45a 100644 --- a/runner/test/cases/server/plugins/engine/WelshSummaryViewModel.json +++ b/runner/test/cases/server/plugins/engine/WelshSummaryViewModel.json @@ -1,5 +1,5 @@ { - "metadata": { "isWelsh": true }, + "metadata": { "isWelsh": true, "has_eligibility": false }, "startPage": "/first-page", "pages": [ { diff --git a/runner/test/cases/server/services/webhookService.test.ts b/runner/test/cases/server/services/webhookService.test.ts index d2227bdc4..c4273a766 100644 --- a/runner/test/cases/server/services/webhookService.test.ts +++ b/runner/test/cases/server/services/webhookService.test.ts @@ -30,7 +30,7 @@ suite("Server WebhookService Service", () => { const serverMock = { logger: loggerSpy }; const webHookeService = new WebhookService(serverMock); const result = await webHookeService.postRequest("/url", {}); - expect(result).to.equal("1234"); + expect(result).to.equal({ reference: "1234" }); }); test("Webhook returns correct reference when payload is object", async () => {