BAU unit test fix and run against adapter also stop unit tests for fe…

…w features such as multi start page and playback since those are not in use but later we might need to either remove them or update the functionality
communitiesuk · Feb 10, 2025 · ba5e5e3 · ba5e5e3
1 parent bae6100
commit ba5e5e3
Show file tree

Hide file tree

Showing 14 changed files with 901 additions and 286 deletions.
diff --git a/.github/workflows/copilot_deploy.yml b/.github/workflows/copilot_deploy.yml
@@ -136,6 +136,7 @@ jobs:
           echo "--  Building digital-form-builder queue-model locally  --"
           yarn queue-model build
           echo "--  Running unit tests  --"
+          cd ..
           yarn runner test-cov
 
       - name: Set up Docker Buildx property

diff --git a/runner/src/server/plugins/engine/components/AdapterYesNoField.ts b/runner/src/server/plugins/engine/components/AdapterYesNoField.ts
@@ -9,7 +9,7 @@ export class AdapterYesNoField extends YesNoField {
         super(def, model);
         this.list.items[0].text = model.options.translationEn.components.yesOrNoField.yes;
         this.list.items[1].text = model.options.translationEn.components.yesOrNoField.no;
-        if (model.def.metadata?.isWelsh) {
+        if (model.def?.metadata?.isWelsh) {
             this.list.items[0].text = model.options.translationCy.components.yesOrNoField.yes;
             this.list.items[1].text = model.options.translationCy.components.yesOrNoField.no;
         }

diff --git a/runner/src/server/views/partials/modal-dialog.html b/runner/src/server/views/partials/modal-dialog.html
@@ -0,0 +1,17 @@
+<dialog id="js-modal-dialog" data-minutes-idle-timeout="{{ data['modalIdleTime'] or '25'}}" data-minutes-modal-visible="{{ data['modalVisibleTime'] or '5'}}"
+        data-url-redirect="/timeout" class="modal-dialog dialog" role="dialog" aria-live="polite" aria-labelledby="dialog-title" aria-describedby="at-timer">
+    <div class="modal-dialog__inner">
+        <h1 id="dialog-title" class="heading-large govuk-heading-l">
+            Your application will time out soon
+        </h1>
+        <div class="modal-dialog__inner__text">
+            <div class="timer" aria-hidden="true" aria-relevant="additions"></div>
+            <div id="at-timer" class="at-timer govuk-visually-hidden" role="status"></div>
+        </div>
+        <div class="modal-dialog__inner__block">
+            <button class="button dialog-button modal-dialog__inner__button js-dialog-close">
+                Continue application
+            </button>
+        </div>
+    </div>
+</dialog>
diff --git a/runner/test/cases/server/declarations.json b/runner/test/cases/server/declarations.json
@@ -0,0 +1,158 @@
+{
+    "startPage": "/declarations",
+    "pages": [
+        {
+            "path": "/summary",
+            "title": "Check your answers",
+            "components": [],
+            "next": [],
+            "section": "HgUinB",
+            "controller": "./pages/summary.js"
+        },
+        {
+            "path": "/declarations",
+            "title": "Declarations",
+            "components": [
+                {
+                    "type": "Html",
+                    "content": "<p class=\"govuk-body govuk-!-font-weight-bold\">In this section, we'll ask you to:</p>\n<ul class=\"govuk-list govuk-list--bullet\">\n<li>confirm you\u00a0have signed the Local Digital Declaration and agree to follow the 5 principles</li>\n<li>confirm your section 151 officer consents to the funds being carried over and spent in the next financial year (March 2025 to April 2026) and beyond, if deemed necessary in project budget planning</li>\n<li>confirm you agree to let all outputs from this work be published under open licence with a view to any organisation accessing, using or adopting them freely</li>\n<li>confirm the information you have provided is accurate</li>\n</ul>",
+                    "options": {},
+                    "schema": {},
+                    "name": "rhgBAM"
+                }
+            ],
+            "next": [
+                {
+                    "path": "/agree-to-the-final-confirmations-DWyips"
+                }
+            ],
+            "section": "HgUinB",
+            "controller": "start.js"
+        },
+        {
+            "path": "/agree-to-the-final-confirmations-DWyips",
+            "title": "Agree to the final confirmations",
+            "components": [
+                {
+                    "options": {
+                        "hideTitle": true
+                    },
+                    "type": "CheckboxesField",
+                    "title": "Confirmation you have signed the Local Digital Declaration and agree to follow the 5 principles",
+                    "hint": "",
+                    "schema": {},
+                    "name": "WVciwy",
+                    "list": "oPbYLL",
+                    "values": {
+                        "type": "listRef"
+                    }
+                },
+                {
+                    "options": {
+                        "hideTitle": true
+                    },
+                    "type": "CheckboxesField",
+                    "title": "Confirmation your section 151 officer consents to the funds being carried over and spent in the next financial year (March 2025 to April 2026) and beyond if deemed necessary in project budget planning",
+                    "hint": "",
+                    "schema": {},
+                    "name": "kQMvMh",
+                    "list": "YWsqpa",
+                    "values": {
+                        "type": "listRef"
+                    }
+                },
+                {
+                    "options": {
+                        "hideTitle": true
+                    },
+                    "type": "CheckboxesField",
+                    "title": "Confirmation you agree to let all outputs from this work be published under open licence with a view to any organisation accessing, using or adopting them freely",
+                    "hint": "",
+                    "schema": {},
+                    "name": "kassVI",
+                    "list": "Xuqipi",
+                    "values": {
+                        "type": "listRef"
+                    }
+                },
+                {
+                    "options": {
+                        "hideTitle": true
+                    },
+                    "type": "CheckboxesField",
+                    "title": "Confirmation the information you have provided is accurate",
+                    "hint": "",
+                    "schema": {},
+                    "name": "bFQXxj",
+                    "list": "ijIKGQ",
+                    "values": {
+                        "type": "listRef"
+                    }
+                }
+            ],
+            "next": [
+                {
+                    "path": "/summary"
+                }
+            ],
+            "section": "HgUinB"
+        }
+    ],
+    "lists": [
+        {
+            "type": "string",
+            "items": [
+                {
+                    "text": "You have signed the Local Digital Declaration and agree to follow the 5 principles",
+                    "value": "You have signed the Local Digital Declaration and agree to follow the 5 principles"
+                }
+            ],
+            "name": "oPbYLL",
+            "title": "Local Digital Declaration and 5 principles"
+        },
+        {
+            "type": "string",
+            "items": [
+                {
+                    "text": "Your section 151 officer consents to the funds being carried over and spent in the next financial year (March 2025 to April 2026) and beyond if deemed necessary in project budget planning",
+                    "value": "Your section 151 officer consents to the funds being carried over and spent in the next financial year (March 2025 to April 2026) and beyond if deemed necessary in project budget planning"
+                }
+            ],
+            "name": "YWsqpa",
+            "title": "Section 151 officer consent"
+        },
+        {
+            "type": "string",
+            "items": [
+                {
+                    "text": "You agree to let all outputs from this work be published under open licence with a view to any organisation accessing, using or adopting them freely",
+                    "value": "You agree to let all outputs from this work be published under open licence with a view to any organisation accessing, using or adopting them freely"
+                }
+            ],
+            "name": "Xuqipi",
+            "title": "Open licence"
+        },
+        {
+            "type": "string",
+            "items": [
+                {
+                    "text": "The information you have provided is accurate",
+                    "value": "The information you have provided is accurate"
+                }
+            ],
+            "name": "ijIKGQ",
+            "title": "Accurate information"
+        }
+    ],
+    "conditions": [],
+    "sections": [
+        {
+            "name": "HgUinB",
+            "title": "Declarations",
+            "hideTitle": true
+        }
+    ],
+    "outputs": [],
+    "skipSummary": false,
+    "name": "Apply for Apply for funding to begin your digital planning improvement journey"
+}
diff --git a/runner/test/cases/server/plugins/engine/components/YesNoField.test.ts b/runner/test/cases/server/plugins/engine/components/YesNoField.test.ts
@@ -1,28 +1,30 @@
 import * as Code from "@hapi/code";
 import * as Lab from "@hapi/lab";
-// @ts-ignore
-import {YesNoField} from "src/server/plugins/engine/components";
 
 const lab = Lab.script();
 exports.lab = lab;
 const {expect} = Code;
 const {suite, describe, it} = lab;
 import sinon from "sinon";
 import {TranslationLoaderService} from "../../../../../../src/server/services/TranslationLoaderService";
+import {AdapterYesNoField} from "../../../../../../src/server/plugins/engine/components/AdapterYesNoField";
+import {AdapterComponentDef} from "@communitiesuk/model";
+import {AdapterFormModel} from "../../../../../../src/server/plugins/engine/models";
 
 suite("YesNoField", () => {
     describe("Generated schema", () => {
         const translationService: TranslationLoaderService = new TranslationLoaderService();
         const translations = translationService.getTranslations();
-        const componentDefinition = {
+        const componentDefinition: AdapterComponentDef = {
             subType: "field",
             type: "YesNoField",
             name: "speakEnglish",
             title: "Speak English?",
-            schema: {}
+            schema: {},
+            options: {},
         };
-
-        const formModel = {
+        //@ts-ignore
+        const formModel: AdapterFormModel = {
             makePage: () => sinon.stub(),
             getList: () => ({
                 name: "__yesNo",
@@ -83,13 +85,14 @@ suite("YesNoField", () => {
             };
 
             it("viewModel item Yes is checked when evaluating boolean true", () => {
-                const component = new YesNoField(componentDefinition, formModel);
+                const component = new AdapterYesNoField(componentDefinition, formModel);
                 const formData = {
                     speakEnglish: true,
                     lang: "en",
                 };
-
+                //@ts-ignore
                 const viewModel = component.getViewModel(formData);
+                //@ts-ignore
                 const yesItem = viewModel.items.filter(
                     (item) => item.text === "Yes"
                 )[0];
@@ -102,13 +105,14 @@ suite("YesNoField", () => {
             });
 
             it("viewModel item Yes is checked when evaluating string 'true'", () => {
-                const component = new YesNoField(componentDefinition, formModel);
+                const component = new AdapterYesNoField(componentDefinition, formModel);
                 const formData = {
                     speakEnglish: "true",
                     lang: "en",
                 };
-
+                //@ts-ignore
                 const viewModel = component.getViewModel(formData);
+                //@ts-ignore
                 const yesItem = viewModel.items.filter(
                     (item) => item.text === "Yes"
                 )[0];
@@ -121,13 +125,14 @@ suite("YesNoField", () => {
             });
 
             it("viewModel item No is checked when evaluating boolean false", () => {
-                const component = new YesNoField(componentDefinition, formModel);
+                const component = new AdapterYesNoField(componentDefinition, formModel);
                 const formData = {
                     speakEnglish: false,
                     lang: "en",
                 };
-
+                //@ts-ignore
                 const viewModel = component.getViewModel(formData);
+                //@ts-ignore
                 const noItem = viewModel.items.filter((item) => item.text === "No")[0];
 
                 expect(noItem).to.equal({
@@ -138,13 +143,14 @@ suite("YesNoField", () => {
             });
 
             it("viewModel item No is checked when evaluating string 'false'", () => {
-                const component = new YesNoField(componentDefinition, formModel);
+                const component = new AdapterYesNoField(componentDefinition, formModel);
                 const formData = {
                     speakEnglish: "false",
                     lang: "en",
                 };
-
+                //@ts-ignore
                 const viewModel = component.getViewModel(formData);
+                //@ts-ignore
                 const noItem = viewModel.items.filter((item) => item.text === "No")[0];
 
                 expect(noItem).to.equal({