{{ content.explanation1 | safe }}
+{{ content.explanation1 | safe }}
{{ addressFinder( fields, content, diff --git a/app/steps/ui/executors/alias/index.js b/app/steps/ui/executors/alias/index.js index 4a139355d1..f0936a203b 100644 --- a/app/steps/ui/executors/alias/index.js +++ b/app/steps/ui/executors/alias/index.js @@ -1,18 +1,37 @@ 'use strict'; const ValidationStep = require('app/core/steps/ValidationStep'); +const {findIndex} = require('lodash'); +const FormatName = require('../../../../utils/FormatName'); +const ExecutorsWrapper = require('app/wrappers/Executors'); +const pageUrl = '/executors-alias'; class ExecutorsAlias extends ValidationStep { + static getUrl(index = '*') { + return `${pageUrl}/${index}`; + } + + getContextData(req) { + const ctx = super.getContextData(req); + if (req.params && !isNaN(req.params[0])) { + ctx.index = parseInt(req.params[0]); + } else { + ctx.index = this.recalcIndex(ctx, 0); + ctx.redirect = `${pageUrl}/${ctx.index}`; + } + ctx.otherExecName = ctx.list?.[ctx.index] ? ctx.list[ctx.index].fullName : ''; + ctx.deceasedName = FormatName.format(req.session.form.deceased); + return ctx; + } - static getUrl() { - return '/executors-alias'; + recalcIndex(ctx, index) { + return findIndex(ctx.list, o => o.isApplying === true && o.isDead !== true, index + 1); } pruneFormData(ctx) { - if (ctx.list && ctx.alias === 'optionNo') { + if (ctx.list && Array.isArray(ctx.list)) { const list = ctx.list.map(executor => { - if (executor.hasOtherName) { - executor.hasOtherName = false; + if (executor.hasOtherName === false) { delete executor.currentName; delete executor.currentNameReason; delete executor.otherReason; @@ -23,12 +42,44 @@ class ExecutorsAlias extends ValidationStep { } return ctx; } - + handleGet(ctx) { + if (ctx.list?.[ctx.index]) { + if (ctx.list[ctx.index].hasOtherName === true) { + ctx.alias = 'optionYes'; + } else if (ctx.list[ctx.index].hasOtherName === false) { + ctx.alias = 'optionNo'; + } else { + ctx.alias = ''; + } + } + return [ctx]; + } handlePost(ctx, errors) { - ctx = this.pruneFormData(ctx); + const executor = ctx.list[ctx.index]; + if (executor.isApplying) { + if (ctx.alias === 'optionYes') { + executor.hasOtherName = true; + } else if (ctx.alias === 'optionNo') { + executor.hasOtherName = false; + ctx = this.pruneFormData(ctx); + } + } return [ctx, errors]; } + nextStepUrl(req, ctx) { + if (ctx.alias === 'optionNo') { + const nextIndex = this.recalcIndex(ctx, ctx.index); + if (nextIndex !== -1) { + return ExecutorsAlias.getUrl(nextIndex); + } + return '/executor-contact-details/1'; + } else if (ctx.alias === 'optionYes') { + return `/executor-id-name/${ctx.index}`; + } + return this.next(req, ctx).constructor.getUrl(ctx.index); + } + nextStepOptions() { return { options: [ @@ -36,6 +87,33 @@ class ExecutorsAlias extends ValidationStep { ] }; } + + isComplete(ctx) { + const executorsWrapper = new ExecutorsWrapper(ctx); + const executors = executorsWrapper.executorsApplying(true); + + const allExecutorsValid = executors.every(executor => { + return (executor.hasOtherName === true && executor.currentName && executor.currentNameReason) || executor.hasOtherName === false; + }); + + return [allExecutorsValid, 'inProgress']; + } + + generateFields(language, ctx, errors) { + const fields = super.generateFields(language, ctx, errors); + if (fields.otherExecName && errors) { + errors[0].msg = errors[0].msg.replace('{executorName}', fields.otherExecName.value); + } + return fields; + } + + action(ctx, formdata) { + super.action(ctx, formdata); + delete ctx.index; + delete ctx.alias; + delete ctx.continue; + return [ctx, formdata]; + } } module.exports = ExecutorsAlias; diff --git a/app/steps/ui/executors/alias/template.html b/app/steps/ui/executors/alias/template.html index 839cb06510..95654c2b93 100644 --- a/app/steps/ui/executors/alias/template.html +++ b/app/steps/ui/executors/alias/template.html @@ -2,20 +2,33 @@ {% from "govuk/components/radios/macro.njk" import govukRadios %} {% from "govuk/components/button/macro.njk" import govukButton %} +{% from "govuk/components/fieldset/macro.njk" import govukFieldset %} {% block form_content %} - {{ govukRadios({ + {% call govukFieldset({ + legend: { + text: content.question | replace("{executorWillName}", fields.otherExecName.value) | safe, + isPageHeading: true, + classes: "govuk-fieldset__legend--l" + } + }) %} +{{ content.paragraph1 | replace("{executorWillName}", fields.otherExecName.value) + | replace("{deceasedName}", fields.deceasedName.value) | safe }}
+ +{{ content.paragraph2 | safe }}
+{{ content.paragraph3 | safe }}
+{{ govukRadios({ classes: "govuk-radios--inline", idPrefix: "alias", name: "alias", - fieldset: { - legend: { - text: content.question | safe, - isPageHeading: true, - classes: "govuk-fieldset__legend--l" - } - }, - errorMessage: { text: fields.alias.errorMessage | safe } if fields.alias.errorMessage, + errorMessage: { text: fields.alias.errorMessage + | replace("{executorName}", fields.otherExecName.value) | safe } if fields.alias.errorMessage, items: [ { value: "optionYes", @@ -29,6 +42,7 @@ } ] }) }} + {% endcall %}{{ content.paragraph1 | safe }}
+{{ content.paragraph1 | safe }}
+{{ content.paragraph2| replace("{deceasedName}", fields.deceasedName.value) | safe }}
{{ unorderedList([ content["applicant-rights1"], content["applicant-rights2"], content["applicant-rights3"]]) }} +{{ content.contactOtherExecs | safe }}
+{{ content.applicantsNotDealing | safe }}
+ {% if fields.list.value | length == 2 %} +{{ content.paragraph1WithCodicil if fields.codicilPresent.value == "true" else content.paragraph1 | replace("{deceasedName}", fields.deceasedName.value) | safe}}
+{{ content.paragraph2 | safe }}
+ +{{ content.questionHint | safe }}
+{{ content.paragraph1 | replace("{executorName}", fields.otherExecName.value) | safe }}
+{{ content.paragraph2 | safe }}
- {% set label = content.email + "{{ content.mobileHint | safe }}
- {{ govukInput({ label: { text: content.mobile | safe }, id: "mobile", name: "mobile", + hint: { + text: content.mobileHint | safe + }, value: fields.mobile.value | safe, errorMessage: { text: fields.mobile.errorMessage | safe } if fields.mobile.errorMessage, attributes: { diff --git a/app/steps/ui/executors/currentname/index.js b/app/steps/ui/executors/currentname/index.js index 70c7c6848b..8a806f18fa 100644 --- a/app/steps/ui/executors/currentname/index.js +++ b/app/steps/ui/executors/currentname/index.js @@ -3,7 +3,7 @@ const ValidationStep = require('app/core/steps/ValidationStep'); const {findIndex, get} = require('lodash'); const ExecutorsWrapper = require('app/wrappers/Executors'); -const pageUrl = '/executor-current-name'; +const pageUrl = '/executor-id-name'; class ExecutorCurrentName extends ValidationStep { @@ -19,11 +19,12 @@ class ExecutorCurrentName extends ValidationStep { ctx.index = this.recalcIndex(ctx, 0); ctx.redirect = `${pageUrl}/${ctx.index}`; } + ctx.executorName = ctx.list?.[ctx.index] ? ctx.list[ctx.index].fullName : ''; return ctx; } handleGet(ctx) { - if (ctx.list && ctx.list[ctx.index]) { + if (ctx.list?.[ctx.index]) { ctx.currentName = ctx.list[ctx.index].currentName; } return [ctx]; @@ -66,6 +67,14 @@ class ExecutorCurrentName extends ValidationStep { const executorsWrapper = new ExecutorsWrapper(ctx); return [executorsWrapper.executorsWithAnotherName().every(exec => exec.currentName), 'inProgress']; } + + generateFields(language, ctx, errors) { + const fields = super.generateFields(language, ctx, errors); + if (fields.executorName && errors) { + errors[0].msg = errors[0].msg.replace('{executorName}', fields.executorName.value); + } + return fields; + } } module.exports = ExecutorCurrentName; diff --git a/app/steps/ui/executors/currentname/template.html b/app/steps/ui/executors/currentname/template.html index 62e32581a8..1381ecee73 100644 --- a/app/steps/ui/executors/currentname/template.html +++ b/app/steps/ui/executors/currentname/template.html @@ -18,11 +18,9 @@ }, id: "currentName", name: "currentName", - hint: { - text: content.currentNameHint | safe - }, value: fields.currentName.value | safe, - errorMessage: { text: fields.currentName.errorMessage | safe } if fields.currentName.errorMessage, + errorMessage: { text: fields.currentName.errorMessage + | replace("{executorName}", fields.executorName.value) | safe } if fields.currentName.errorMessage, attributes: { maxlength: 200 }, diff --git a/app/steps/ui/executors/currentnamereason/index.js b/app/steps/ui/executors/currentnamereason/index.js index b21a4827db..118150010d 100644 --- a/app/steps/ui/executors/currentnamereason/index.js +++ b/app/steps/ui/executors/currentnamereason/index.js @@ -4,8 +4,10 @@ const ValidationStep = require('app/core/steps/ValidationStep'); const {findIndex, get, startsWith} = require('lodash'); const ExecutorsWrapper = require('app/wrappers/Executors'); const AliasData = require('app/utils/AliasData.js'); +const FieldError = require('../../../../components/error'); +const WillWrapper = require('../../../../wrappers/Will'); -const path = '/executor-current-name-reason/'; +const path = '/executor-name-reason/'; class ExecutorCurrentNameReason extends ValidationStep { @@ -15,6 +17,7 @@ class ExecutorCurrentNameReason extends ValidationStep { getContextData(req) { const ctx = super.getContextData(req); + this.setCodicilFlagInCtx(ctx, req.session.form); if (req.params && !isNaN(req.params[0])) { ctx.index = parseInt(req.params[0]); req.session.indexPosition = ctx.index; @@ -24,18 +27,32 @@ class ExecutorCurrentNameReason extends ValidationStep { } else if (startsWith(req.path, path)) { ctx.index = this.recalcIndex(ctx, 0); } - if (ctx.list && ctx.list[ctx.index]) { + if (ctx.list?.[ctx.index]) { ctx.otherExecName = ctx.list[ctx.index].currentName; + } + return ctx; + } + pruneFormData(ctx) { + if (ctx.list && ctx.alias === 'optionNo') { + const list = ctx.list.map(executor => { + if (executor.hasOtherName) { + executor.hasOtherName = false; + delete executor.currentNameReason; + } + return executor; + }); + return Object.assign(ctx, {list}); } return ctx; } handleGet(ctx) { - if (ctx.list && ctx.list[ctx.index]) { + if (ctx.list?.[ctx.index]) { ctx.currentNameReason = ctx.list[ctx.index].currentNameReason; ctx.otherReason = ctx.list[ctx.index].otherReason; } + ctx = this.pruneFormData(ctx); return [ctx]; } @@ -60,7 +77,7 @@ class ExecutorCurrentNameReason extends ValidationStep { } recalcIndex(ctx, index) { - return findIndex(ctx.list, o => o.hasOtherName, index + 1); + return findIndex(ctx.list, o => o.isApplying, index + 1); } nextStepUrl(req, ctx) { @@ -79,11 +96,51 @@ class ExecutorCurrentNameReason extends ValidationStep { }; } + setCodicilFlagInCtx(ctx, formdata) { + ctx.codicilPresent = (new WillWrapper(formdata.will)).hasCodicils(); + } + isComplete(ctx) { const executorsWrapper = new ExecutorsWrapper(ctx); return [executorsWrapper.executorsWithAnotherName().every(exec => exec.currentNameReason), 'inProgress']; } + validate(ctx, formdata, language) { + const validationResult = super.validate(ctx, formdata, language); + if (!validationResult[0]) { + ctx.errors = this.createErrorMessages(validationResult[1], ctx, language); + } + return validationResult; + } + + createErrorMessages(validationErrors, ctx, language) { + const errorMessages = []; + validationErrors.forEach((validationError) => { + const executorName = ctx.list[ctx.index].fullName; + const errorMessage = this.composeMessage(language, ctx, executorName); + errorMessages.push(errorMessage); + validationError.msg = errorMessage.msg; + if (ctx.currentNameReason === 'optionOther' && !ctx.otherReason) { + validationError.field = 'otherReason'; + } else { + validationError.field = 'currentNameReason'; + } + }); + return errorMessages; + } + + composeMessage(language, ctx, executorName) { + if (ctx.currentNameReason === 'optionOther' && !ctx.otherReason) { + const messageType = 'required'; + return FieldError('otherReason', messageType, this.resourcePath, this.generateContent({}, {}, language), language); + } else if (typeof ctx.currentNameReason === 'undefined' || !ctx.currentNameReason) { + const messageType = 'required'; + const errorMessage = FieldError('currentNameReason', messageType, this.resourcePath, this.generateContent({}, {}, language), language); + errorMessage.msg = errorMessage.msg.replace('{executorName}', executorName); + return errorMessage; + } + } + action(ctx, formdata) { super.action(ctx, formdata); diff --git a/app/steps/ui/executors/currentnamereason/template.html b/app/steps/ui/executors/currentnamereason/template.html index dabc941653..b75156160b 100644 --- a/app/steps/ui/executors/currentnamereason/template.html +++ b/app/steps/ui/executors/currentnamereason/template.html @@ -3,6 +3,7 @@ {% from "govuk/components/radios/macro.njk" import govukRadios %} {% from "govuk/components/input/macro.njk" import govukInput %} {% from "govuk/components/button/macro.njk" import govukButton %} +{% from "govuk/components/fieldset/macro.njk" import govukFieldset %} {% block form_content %} {% set otherHtml %} @@ -21,17 +22,20 @@ }) }} {% endset -%} + {% call govukFieldset({ + legend: { + text: ((content.questionWithCodicil if fields.codicilPresent.value == "true" else content.question) | replace("{executorName}", fields.otherExecName.value)) | safe, + isPageHeading: true, + classes: "govuk-fieldset__legend--l" + } + }) %} + +{{ content.paragraph1 | replace("{executorName}", fields.otherExecName.value) | safe }}
+ {{ govukRadios({ classes: "govuk-radios", idPrefix: "currentNameReason", name: "currentNameReason", - fieldset: { - legend: { - text: content.question | replace("{executorName}", fields.otherExecName.value) | safe, - isPageHeading: true, - classes: "govuk-fieldset__legend--l" - } - }, errorMessage: { text: fields.currentNameReason.errorMessage | safe } if fields.currentNameReason.errorMessage, items: [ { @@ -49,6 +53,16 @@ text: content["optionDeedPoll"] | safe, checked: true if fields.currentNameReason.value == "optionDeedPoll" }, + { + value: "optionDifferentSpelling", + text: content["optionDifferentSpelling"] | safe, + checked: true if fields.currentNameReason.value == "optionDifferentSpelling" + }, + { + value: "optionPartOfNameNotIncluded", + text: content["optionPartOfNameNotIncluded"] | safe, + checked: true if fields.currentNameReason.value == "optionPartOfNameNotIncluded" + }, { value: "optionOther", text: content["optionOther"] | safe, @@ -59,6 +73,7 @@ } ] }) }} + {% endcall %}{{ content.paragraph1 | safe }}
- {{ unorderedList([ - content["applicant-rights1"], - content["applicant-rights2"], - content["applicant-rights3"]]) - }} -{{ content["applicants-not-dealing"] | safe }}
- - {{ govukCheckboxes({ - idPrefix: "executorsApplying", - name: "executorsApplying[]", - errorMessage: { text: fields.executorsApplying.errorMessage | safe } if fields.executorsApplying.errorMessage, - items: fields.options.value - }) }} - {% endcall %} - -{{ content.hintTextWithCodicil if fields.codicilPresent.value == "true" else content.hintText | safe }}
+ +{{ content.paragraph | safe }}
-{{ fields.applicantCurrentName.value | safe }}
+{{ content.paragraphWillCodicil if fields.codicilPresent.value == "true" else content.paragraph | safe }}
+{{ content.paragraph2 | safe }}
- {% for i in range(0, fields.executorsNumber.value -1) %} -{{ content.hintText | safe }}
- - {{ govukInput({ - label: { - html: content.executorsNumber - }, - id: "executorsNumber", - name: "executorsNumber", - type: "number", - value: fields.executorsNumber.value | safe, - errorMessage: { text: fields.executorsNumber.errorMessage | safe } if fields.executorsNumber.errorMessage, - attributes: { - maxlength: 5 - }, - classes: "govuk-input--width-3" - }) }} - {% endcall %} - -{{ content.optionRenunciatedHint | replace("{applicationFormPA15}", globals.links.applicationFormPA15) | safe }}
-{{ content.optionPowerReservedHint | safe }}
{% endset %} {{ govukRadios({ @@ -17,21 +17,25 @@ name: "notApplyingReason", fieldset: { legend: { - text: content.question | replace("{executorFullName}", fields.list.value[fields.index.value].fullName) | safe, + text: content.question | replace("{executorName}", fields.executorName.value) | safe, isPageHeading: true, classes: "govuk-fieldset__legend--l" } }, - errorMessage: { text: fields.notApplyingReason.errorMessage | safe } if fields.notApplyingReason.errorMessage, + errorMessage: { text: fields.notApplyingReason.errorMessage + | replace("{executorName}", fields.executorName.value) | safe } if fields.notApplyingReason.errorMessage, items: [ { value: "optionPowerReserved", - text: content["optionPowerReserved"] | safe, - checked: true if fields.notApplyingReason.value == "optionPowerReserved" + text: content["optionPowerReserved"] | replace("{executorName}", fields.executorName.value) | safe, + checked: true if fields.notApplyingReason.value == "optionPowerReserved", + conditional: { + html: optionPowerReservedHint + } }, { value: "optionRenunciated", - text: content["optionRenunciated"] | safe, + text: content["optionRenunciated"] | replace("{executorName}", fields.executorName.value) | safe, checked: true if fields.notApplyingReason.value == "optionRenunciated", conditional: { html: optionRenunciatedHint diff --git a/app/steps/ui/executors/whendied/index.js b/app/steps/ui/executors/whendied/index.js index d46ac7101f..98092e6f18 100644 --- a/app/steps/ui/executors/whendied/index.js +++ b/app/steps/ui/executors/whendied/index.js @@ -2,6 +2,7 @@ const CollectionStep = require('app/core/steps/CollectionStep'); const {findIndex, every, tail, has, get} = require('lodash'); +const FormatName = require('../../../../utils/FormatName'); const path = '/executor-when-died/'; class ExecutorsWhenDied extends CollectionStep { @@ -22,6 +23,14 @@ class ExecutorsWhenDied extends CollectionStep { return [ctx]; } + getContextData(req) { + const ctx = super.getContextData(req); + const formData = req.session.form; + ctx.deceasedName = FormatName.format(formData.deceased); + ctx.executorFullName = ctx.list?.[ctx.index] ? ctx.list[ctx.index].fullName : ''; + return ctx; + } + recalcIndex(ctx, index) { return findIndex(ctx.list, o => o.isDead === true, index + 1); } @@ -59,6 +68,15 @@ class ExecutorsWhenDied extends CollectionStep { return [every(deadExecs, exec => has(exec, 'diedBefore')), 'inProgress']; } + generateFields(language, ctx, errors) { + const fields = super.generateFields(language, ctx, errors); + if (fields.deceasedName && fields.executorFullName && errors) { + errors[0].msg = errors[0].msg.replace('{deceasedName}', fields.deceasedName.value) + .replace('{executorName}', fields.executorFullName.value); + } + return fields; + } + action(ctx, formdata) { super.action(ctx, formdata); delete ctx.diedbefore; diff --git a/app/steps/ui/executors/whendied/template.html b/app/steps/ui/executors/whendied/template.html index 14f8fb09bc..6d51530908 100644 --- a/app/steps/ui/executors/whendied/template.html +++ b/app/steps/ui/executors/whendied/template.html @@ -10,12 +10,14 @@ name: "diedbefore", fieldset: { legend: { - text: content.question | replace("{executorFullName}", fields.list.value[fields.index.value].fullName) | safe, + text: content.question | replace("{executorFullName}", fields.executorFullName.value) + | replace("{deceasedName}", fields.deceasedName.value) | safe, isPageHeading: true, classes: "govuk-fieldset__legend--l" } }, - errorMessage: { text: fields.diedbefore.errorMessage | safe } if fields.diedbefore.errorMessage, + errorMessage: { text: fields.diedbefore.errorMessage | replace("{executorName}", fields.executorFullName.value) +| replace("{deceasedName}", fields.deceasedName.value) | safe } if fields.diedbefore.errorMessage, items: [ { value: "optionYes", diff --git a/app/steps/ui/summary/includes/executors-others-details.njk b/app/steps/ui/summary/includes/executors-others-details.njk index 33217c5433..f24dfb05c7 100644 --- a/app/steps/ui/summary/includes/executors-others-details.njk +++ b/app/steps/ui/summary/includes/executors-others-details.njk @@ -6,7 +6,7 @@ visible: true } ], - url = content.ExecutorsNames.url, + url = content.ExecutorsNamed.url, common = common, alreadyDeclared = fields.summary.alreadyDeclared.value )}} diff --git a/app/steps/ui/summary/includes/executors-others-not-applying.njk b/app/steps/ui/summary/includes/executors-others-not-applying.njk index 27c142474a..f69b3db0ba 100644 --- a/app/steps/ui/summary/includes/executors-others-not-applying.njk +++ b/app/steps/ui/summary/includes/executors-others-not-applying.njk @@ -3,8 +3,8 @@ {{checkanswer( items = [ { - question: content.ExecutorRoles.question | replace("{executorFullName}", executor.fullName ), - answer: content.ExecutorRoles[executor.notApplyingReason], + question: content.ExecutorRoles.question | replace("{executorName}", executor.fullName ), + answer: content.ExecutorRoles[executor.notApplyingReason].replace("{executorName}", executor.fullName), visible: true } ], diff --git a/app/steps/ui/summary/includes/executors-others.njk b/app/steps/ui/summary/includes/executors-others.njk index 6dafee0603..742df9e34f 100644 --- a/app/steps/ui/summary/includes/executors-others.njk +++ b/app/steps/ui/summary/includes/executors-others.njk @@ -10,20 +10,22 @@ common = common, alreadyDeclared = fields.summary.alreadyDeclared.value )}} - +{% if fields.executors.executorsNumber.value > 2 %} {{checkanswer( items = [ { - question: content.ExecutorsDealingWithEstate.question, + question: content.ExecutorsApplying.question, answer: fields.summary.executorsDealingWithEstate.value, - visible: fields.executors.otherExecutorsApplying.value == "optionYes" + visible: fields.summary.executorsDealingWithEstate.value } ], - url = content.ExecutorsDealingWithEstate.url, + url = content.ExecutorsApplying.url, common = common, alreadyDeclared = fields.summary.alreadyDeclared.value, answerIsCollection = true )}} +{% endif %} + {% if fields.executors.alias.value == "optionYes" %} {{checkanswer( diff --git a/app/steps/ui/summary/includes/executors.njk b/app/steps/ui/summary/includes/executors.njk index c6e5a7de25..87f27d675a 100644 --- a/app/steps/ui/summary/includes/executors.njk +++ b/app/steps/ui/summary/includes/executors.njk @@ -1,12 +1,12 @@ {{checkanswer( items = [ { - question: content.ExecutorsNumber.question, - answer: fields.executors.executorsNumber.value, + question: content.ExecutorsNamed.question, + answer: fields.executors.executorsNamed.value, visible: true } ], - url = content.ExecutorsNumber.url, + url = content.ExecutorsNamed.url, common = common, alreadyDeclared = fields.summary.alreadyDeclared.value )}} @@ -14,7 +14,7 @@ {{checkanswer( items = [ { - question: content.ExecutorsAllAlive.question, + question: content.ExecutorsAllAlive.multipleExecutorQuestion, answer: content.ExecutorsAllAlive[fields.executors.allalive.value], visible: fields.executors.executorsNumber.value > 1 } @@ -29,7 +29,7 @@ { question: content.ExecutorsWhoDied.question, answer: fields.summary.executorsWhoDied.value, - visible: fields.executors.allalive.value == "optionNo" + visible: fields.executors.allalive.value == "optionYes" } ], url = content.ExecutorsWhoDied.url, diff --git a/charts/probate-frontend/Chart.yaml b/charts/probate-frontend/Chart.yaml index 619ca7c81a..a7f64f4008 100644 --- a/charts/probate-frontend/Chart.yaml +++ b/charts/probate-frontend/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.0" description: A Helm chart for the HMCTS probate product name: probate-frontend home: https://github.com/hmcts/probate-frontend -version: 2.3.34 +version: 2.3.35 dependencies: - name: nodejs version: 3.1.1 diff --git a/charts/probate-frontend/values.yaml b/charts/probate-frontend/values.yaml index 96c6b11daa..9cbad9ceaf 100644 --- a/charts/probate-frontend/values.yaml +++ b/charts/probate-frontend/values.yaml @@ -21,7 +21,7 @@ nodejs: IDAM_S2S_URL: http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal PAYMENT_API_URL: http://payment-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal VALIDATION_SERVICE_URL: http://probate-business-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal/validate - ORCHESTRATOR_SERVICE_URL: http://probate-orchestrator-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal + ORCHESTRATOR_SERVICE_URL: http://probate-orchestrator-service-pr-1143-java FEES_REGISTRY_URL: http://fees-register-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal/fees-register REFORM_ENVIRONMENT : '{{ .Values.global.environment }}' REDIS_HOST: probate-frontend-redis-cache-{{ .Values.global.environment }}.redis.cache.windows.net diff --git a/test/accessibility/a11yTest.js b/test/accessibility/a11yTest.js index af46a58784..596e4156ec 100644 --- a/test/accessibility/a11yTest.js +++ b/test/accessibility/a11yTest.js @@ -15,7 +15,7 @@ const caseTypes = require('app/utils/CaseTypes'); const stepsToExclude = [ 'Dashboard', 'Summary', 'TaskList', 'Equality', 'PinPage', 'PinSent', 'PinResend', 'AddressLookup', 'ExecutorAddress', 'ExecutorContactDetails', 'ExecutorName', - 'ExecutorNotified', 'ExecutorNameAsOnWill', 'ExecutorApplying', 'DeleteExecutor', 'PaymentStatus', 'AddAlias', 'RemoveAlias', 'ExecutorRoles', 'ExecutorsWhenDied', 'AvayaWebchat' + 'ExecutorNotified', 'ExecutorNameAsOnWill', 'ExecutorApplying', 'DeleteExecutor', 'PaymentStatus', 'AddAlias', 'RemoveAlias', 'ExecutorRoles', 'ExecutorsWhenDied', 'AvayaWebchat', 'RemoveExecutor' ]; const steps = initSteps([`${__dirname}/../../app/steps/action/`, `${__dirname}/../../app/steps/ui`], 'en'); const nock = require('nock'); diff --git a/test/component/applicant/testAddress.js b/test/component/applicant/testAddress.js index 5da27d56e0..f6753149d5 100644 --- a/test/component/applicant/testAddress.js +++ b/test/component/applicant/testAddress.js @@ -1,14 +1,14 @@ 'use strict'; const TestWrapper = require('test/util/TestWrapper'); -const ExecutorsNumber = require('app/steps/ui/executors/number'); +const ExecutorCheckWill = require('app/steps/ui/executors/checkwill'); const formatAddress = address => address.replace(/,/g, ', '); const testCommonContent = require('test/component/common/testCommonContent.js'); describe('applicant-address', () => { let testWrapper; let testAddressData; - const expectedNextUrlForExecsNumber = ExecutorsNumber.getUrl(); + const expectedNextUrlForExecsNumber = ExecutorCheckWill.getUrl(); beforeEach(() => { testWrapper = new TestWrapper('ApplicantAddress'); diff --git a/test/component/deceased/testDivorcePlace.js b/test/component/deceased/testDivorcePlace.js index 096d36309a..b6e218512b 100644 --- a/test/component/deceased/testDivorcePlace.js +++ b/test/component/deceased/testDivorcePlace.js @@ -63,7 +63,7 @@ describe('divorce-place', () => { .send(sessionData) .end(() => { const data = { - '{legalProcess}': 'divorce' + legalProcess: 'divorce' }; testWrapper.testErrors(done, data, 'required'); diff --git a/test/component/executors/testExecutorAlias.js b/test/component/executors/testExecutorAlias.js index 524ef768af..06fdc520e0 100644 --- a/test/component/executors/testExecutorAlias.js +++ b/test/component/executors/testExecutorAlias.js @@ -1,18 +1,37 @@ 'use strict'; const TestWrapper = require('test/util/TestWrapper'); -const ExecutorsWithOtherNames = require('app/steps/ui/executors/othername'); +const ExecutorsAlias = require('app/steps/ui/executors/alias'); +const ExecutorsCurrentName = require('app/steps/ui/executors/currentname'); const ExecutorContactDetails = require('app/steps/ui/executors/contactdetails'); -const testCommonContent = require('test/component/common/testCommonContent.js'); const caseTypes = require('app/utils/CaseTypes'); +const commonContent = require('../../../app/resources/en/translation/common.json'); describe('executors-alias', () => { - let testWrapper; - const expectedNextUrlForExecOtherNames = ExecutorsWithOtherNames.getUrl(); - const expectedNextUrlForExecContactDetails = ExecutorContactDetails.getUrl(); + let testWrapper, sessionData; + const expectedNextUrlForExecOtherNames = ExecutorsCurrentName.getUrl(1); + const expectedNextUrlForExecContactDetails = ExecutorContactDetails.getUrl(1); beforeEach(() => { testWrapper = new TestWrapper('ExecutorsAlias'); + sessionData = { + type: caseTypes.GOP, + ccdCase: { + state: 'Pending', + id: 1234567890123456 + }, + executors: { + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Executor Name1', isApplying: true}, + {fullName: 'Executor Name2', isApplying: true} + ] + }, + deceased: { + firstName: 'John', + lastName: 'Doe' + } + }; }); afterEach(() => { @@ -20,30 +39,55 @@ describe('executors-alias', () => { }); describe('Verify Content, Errors and Redirection', () => { - testCommonContent.runTest('ExecutorsAlias', null, null, [], false, {type: caseTypes.GOP}); - it('test content loaded on the page', (done) => { - const sessionData = { - type: caseTypes.GOP, - ccdCase: { - state: 'Pending', - id: 1234567890123456 - } - }; + it('test help block content is loaded on page', (done) => { + testWrapper.pageUrl = ExecutorsAlias.getUrl(1); + testWrapper.agent.post('/prepare-session/form') + .send(sessionData) + .end(() => { + const playbackData = { + helpTitle: commonContent.helpTitle, + helpHeading1: commonContent.helpHeading1, + helpHeading2: commonContent.helpHeading2, + helpHeading3: commonContent.helpHeading3, + helpTelephoneNumber: commonContent.helpTelephoneNumber, + helpTelephoneOpeningHoursTitle: commonContent.helpTelephoneOpeningHoursTitle, + helpTelephoneOpeningHours1: commonContent.helpTelephoneOpeningHours1, + helpTelephoneOpeningHours2: commonContent.helpTelephoneOpeningHours2, + helpEmailLabel: commonContent.helpEmailLabel.replace(/{contactEmailAddress}/g, commonContent.helpEmail) + }; + testWrapper.testDataPlayback(done, playbackData); + }); + }); + it('test content loaded on the page', (done) => { + sessionData.otherExecName = 'Executor Name1'; + testWrapper.pageUrl = ExecutorsAlias.getUrl(1); testWrapper.agent.post('/prepare-session/form') .send(sessionData) .end(() => { - testWrapper.testContent(done); + const contentData = { + executorWillName: 'Executor Name1', + deceasedName: 'John Doe' + }; + testWrapper.testContent(done, contentData); }); }); it('test errors message displayed for missing data', (done) => { - testWrapper.testErrors(done, {}, 'required'); + testWrapper.pageUrl = testWrapper.pageToTest.constructor.getUrl(1); + const errorsToTest = ['alias']; + testWrapper.testErrors(done, {}, 'required', errorsToTest); }); it(`test it redirects to Executor Other Names when Yes: ${expectedNextUrlForExecOtherNames}`, (done) => { + testWrapper.pageUrl = testWrapper.pageToTest.constructor.getUrl(1); const data = { + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Executor Name1', isApplying: true}, + {fullName: 'Executor Name2', isApplying: true} + ], alias: 'optionYes' }; @@ -51,8 +95,14 @@ describe('executors-alias', () => { }); it(`test it redirects to Executor Contact Details when No: ${expectedNextUrlForExecContactDetails}`, (done) => { + testWrapper.pageUrl = testWrapper.pageToTest.constructor.getUrl(1); const data = { - alias: 'optionNo' + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Executor Name1', isApplying: true}, + {fullName: 'Executor Name2', isApplying: true} + ], + alias: 'optionNo', }; testWrapper.testRedirect(done, data, expectedNextUrlForExecContactDetails); diff --git a/test/component/executors/testExecutorCurrentName.js b/test/component/executors/testExecutorCurrentName.js index cce7866e67..1193181b96 100644 --- a/test/component/executors/testExecutorCurrentName.js +++ b/test/component/executors/testExecutorCurrentName.js @@ -72,7 +72,9 @@ describe('executor-current-name', () => { }); it('test errors message displayed for missing data', (done) => { - testWrapper.testErrors(done, {}, 'required'); + testWrapper.pageUrl = testWrapper.pageToTest.constructor.getUrl(1); + const errorsToTest = ['currentName']; + testWrapper.testErrors(done, {}, 'required', errorsToTest); }); it('test errors message displayed for invalid currentname', (done) => { diff --git a/test/component/executors/testExecutorCurrentNameReason.js b/test/component/executors/testExecutorCurrentNameReason.js index a440910766..9383fa5029 100644 --- a/test/component/executors/testExecutorCurrentNameReason.js +++ b/test/component/executors/testExecutorCurrentNameReason.js @@ -34,30 +34,52 @@ describe('/executor-current-name-reason/', () => { describe('Verify Content, Errors and Redirection', () => { it('test content loaded on the page', (done) => { + const idsToExclude = ['questionWithCodicil']; testWrapper.agent.post('/prepare-session/form') .send(sessionData) .end(() => { const contentData = { executorFullName: 'Executor Name2', - executorName: 'Name2 Executor' + executorName: 'Name2 Executor', + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Executor Name1', isApplying: false}, + {fullName: 'Executor Name2', isApplying: true, currentName: 'Name2 Executor', hasOtherName: true}, + ] }; testWrapper.pageUrl = testWrapper.pageToTest.constructor.getUrl(2); - testWrapper.testContent(done, contentData); + testWrapper.testContent(done, contentData, idsToExclude); }); }); - it('test alias reason validation when no data is entered', (done) => { + it('test alias reason validation when no data is entered for current name reason', (done) => { + testWrapper.pageUrl = testWrapper.pageToTest.constructor.getUrl(2); const errorsToTest = ['currentNameReason']; - testWrapper.testErrors(done, {}, 'required', errorsToTest); + testWrapper.agent.post('/prepare-session/form') + .send(sessionData) + .end(() => { + const data = { + currentNameReason: '', + executorName: 'Executor Name2' + }; + + testWrapper.testErrors(done, data, 'required', errorsToTest); + }); }); it('test alias reason validation when other is selected but no reason is entered', (done) => { + testWrapper.pageUrl = testWrapper.pageToTest.constructor.getUrl(2); const errorsToTest = ['otherReason']; const data = { currentNameReason: 'optionOther', - otherReason: '' + otherReason: '', + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Executor Name1', isApplying: false}, + {fullName: 'Executor Name2', isApplying: true, currentName: 'Name2 Executor', hasOtherName: true}, + ] }; testWrapper.testErrors(done, data, 'required', errorsToTest); diff --git a/test/component/executors/testExecutorsAllAlive.js b/test/component/executors/testExecutorsAllAlive.js index f58ebf9c97..29a22297fe 100644 --- a/test/component/executors/testExecutorsAllAlive.js +++ b/test/component/executors/testExecutorsAllAlive.js @@ -39,12 +39,36 @@ describe('executors-all-alive', () => { }); it('test errors message displayed for missing data', (done) => { - testWrapper.testErrors(done, {}, 'required'); + const sessionData = { + type: caseTypes.GOP, + ccdCase: { + state: 'Pending', + id: 1234567890123456 + }, + executors: { + executorsNumber: 3, + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Many Clouds', isApplying: true}, + {fullName: 'Harvey Smith', isApplying: false} + ] + }, + applicant: {} + }; + const errorsToTest = ['allalive']; + + testWrapper.agent.post('/prepare-session/form') + .send(sessionData) + .end(() => { + const data = { + }; + testWrapper.testErrors(done, data, 'multipleExecutorRequired', errorsToTest); + }); }); it(`test it redirects to executors applying: ${expectedNextUrlForExecsApplying}`, (done) => { const data = { - allalive: 'optionYes' + allalive: 'optionNo' }; testWrapper.testRedirect(done, data, expectedNextUrlForExecsApplying); @@ -52,7 +76,7 @@ describe('executors-all-alive', () => { it(`test it redirects to which executors died: ${expectedNextUrlForExecsWhoDied}`, (done) => { const data = { - allalive: 'optionNo' + allalive: 'optionYes' }; testWrapper.testRedirect(done, data, expectedNextUrlForExecsWhoDied); diff --git a/test/component/executors/testExecutorsApplying.js b/test/component/executors/testExecutorsApplying.js index ea15767d92..db1c14d06d 100644 --- a/test/component/executors/testExecutorsApplying.js +++ b/test/component/executors/testExecutorsApplying.js @@ -1,14 +1,14 @@ 'use strict'; const TestWrapper = require('test/util/TestWrapper'); -const ExecutorsDealingWithEstate = require('app/steps/ui/executors/dealingwithestate'); +const ExecutorsAlias = require('app/steps/ui/executors/alias'); const ExecutorRoles = require('app/steps/ui/executors/roles'); const testCommonContent = require('test/component/common/testCommonContent.js'); const caseTypes = require('app/utils/CaseTypes'); describe('executors-applying', () => { let testWrapper; - const expectedNextUrlForExecDealingWith = ExecutorsDealingWithEstate.getUrl(); + const expectedNextUrlForExecAliasWith = ExecutorsAlias.getUrl('*'); const expectedNextUrlForExecRoles = ExecutorRoles.getUrl('*'); beforeEach(() => { @@ -22,40 +22,180 @@ describe('executors-applying', () => { describe('Verify Content, Errors and Redirection', () => { testCommonContent.runTest('ExecutorsApplying', null, null, [], false, {type: caseTypes.GOP}); - it('test content loaded on the page', (done) => { + it('test content loaded on the page for single executor', (done) => { const sessionData = { type: caseTypes.GOP, ccdCase: { state: 'Pending', id: 1234567890123456 + }, + executors: { + executorsNumber: 3, + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Many Clouds', isApplying: true} + ] + }, + applicant: { + alias: 'Bobby Alias' + }, + deceased: { + firstName: 'John', + lastName: 'Doe' } }; + const contentToExclude = ['multiExecQuestion']; testWrapper.agent.post('/prepare-session/form') .send(sessionData) .end(() => { - testWrapper.testContent(done); + const contentData = {deceasedName: 'John Doe', executorName: 'Many Clouds'}; + + testWrapper.testContent(done, contentData, contentToExclude); }); }); + it('test content loaded on the page for multiple executors', (done) => { + const sessionData = { + type: caseTypes.GOP, + ccdCase: { + state: 'Pending', + id: 1234567890123456 + }, + executors: { + executorsNumber: 3, + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Many Clouds', isApplying: true}, + {fullName: 'Executor Two', isApplying: true} + ] + }, + applicant: { + alias: 'Bobby Alias' + }, + deceased: { + firstName: 'John', + lastName: 'Doe' + } + }; + const contentToExclude = ['oneOtherExecQuestion', 'optionYes', 'optionNo']; + + testWrapper.agent.post('/prepare-session/form') + .send(sessionData) + .end(() => { + const contentData = {deceasedName: 'John Doe', executorName: 'Many Clouds'}; + + testWrapper.testContent(done, contentData, contentToExclude); + }); + }); it('test errors message displayed for missing data', (done) => { - testWrapper.testErrors(done, {}, 'required'); + const sessionData = { + type: caseTypes.GOP, + ccdCase: { + state: 'Pending', + id: 1234567890123456 + }, + executors: { + executorsNumber: 3, + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Many Clouds', isApplying: true} + ] + }, + applicant: {} + }; + const errorsToTest = ['otherExecutorsApplying']; + + testWrapper.agent.post('/prepare-session/form') + .send(sessionData) + .end(() => { + const data = { + otherExecutorsApplying: '', + executorName: 'Many Clouds' + }; + + testWrapper.testErrors(done, data, 'required', errorsToTest); + }); }); - it(`test it redirects to ExecutorsDealingWithEstate if there are other executors dealing with the estate: ${expectedNextUrlForExecDealingWith}`, (done) => { + it('test errors message displayed for more than 3 additional applicants', (done) => { + const sessionData = { + type: caseTypes.GOP, + ccdCase: { + state: 'Pending', + id: 1234567890123456 + }, + executors: { + executorsNumber: 3, + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Many Clouds', isApplying: true}, + {fullName: 'Harvey Smith', isApplying: false} + ] + }, + applicant: {} + }; + const errorsToTest = ['executorsApplying']; + + testWrapper.agent.post('/prepare-session/form') + .send(sessionData) + .end(() => { + const data = { + executorsApplying: ['many clouds', 'many clouds', 'many clouds', 'many clouds'] + }; + + testWrapper.testErrors(done, data, 'invalid', errorsToTest); + }); + }); + + it(`test it redirects to ExecutorsAlias if there are single other executor dealing with the estate: ${expectedNextUrlForExecAliasWith}`, (done) => { const data = { + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Executor Name 1', isApplying: true} + ], otherExecutorsApplying: 'optionYes' }; - testWrapper.testRedirect(done, data, expectedNextUrlForExecDealingWith); + testWrapper.testRedirect(done, data, expectedNextUrlForExecAliasWith); }); - it(`test it redirects to executors roles if there are no other executors dealing with the estate: ${expectedNextUrlForExecRoles}`, (done) => { + it(`test it redirects to ExecutorsAlias if there are multi executors dealing with the estate: ${expectedNextUrlForExecAliasWith}`, (done) => { + const data = { + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Executor Name 1', isApplying: true}, + {fullName: 'Executor Name 2', isApplying: true} + ], + executorsApplying: ['Executor Name 1', 'Executor Name 2'] + }; + + testWrapper.testRedirect(done, data, expectedNextUrlForExecAliasWith); + }); + it(`test it redirects to executors roles if there are no executor dealing with the estate: ${expectedNextUrlForExecRoles}`, (done) => { const data = { + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Executor Name 1', isApplying: true} + ], otherExecutorsApplying: 'optionNo' }; testWrapper.testRedirect(done, data, expectedNextUrlForExecRoles); }); + + it(`test it redirects to executors roles if there are no multi executors dealing with the estate: ${expectedNextUrlForExecRoles}`, (done) => { + const data = { + list: [ + {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, + {fullName: 'Executor Name 1', isApplying: true}, + {fullName: 'Executor Name 2', isApplying: true}, + {fullName: 'Executor Name 3', isApplying: true}, + ], + executorsApplying: [' '] + }; + + testWrapper.testRedirect(done, data, expectedNextUrlForExecRoles); + }); }); }); diff --git a/test/component/executors/testExecutorsDealing.js b/test/component/executors/testExecutorsDealing.js deleted file mode 100644 index d9e10d3fb9..0000000000 --- a/test/component/executors/testExecutorsDealing.js +++ /dev/null @@ -1,78 +0,0 @@ -'use strict'; - -const TestWrapper = require('test/util/TestWrapper'); -const testCommonContent = require('test/component/common/testCommonContent.js'); -const caseTypes = require('app/utils/CaseTypes'); - -describe('executors-dealing-with-estate', () => { - let testWrapper, sessionData; - - beforeEach(() => { - testWrapper = new TestWrapper('ExecutorsDealingWithEstate'); - sessionData = { - type: caseTypes.GOP, - ccdCase: { - state: 'Pending', - id: 1234567890123456 - }, - executors: { - executorsNumber: 3, - list: [ - {firstName: 'John', lastName: 'TheApplicant', isApplying: true, isApplicant: true}, - {fullName: 'Many Clouds', isApplying: true}, - {fullName: 'Harvey Smith', isApplying: false} - ] - }, - applicant: {} - }; - }); - - afterEach(() => { - testWrapper.destroy(); - }); - - describe('Verify Content, Errors and Redirection', () => { - testCommonContent.runTest('ExecutorsDealingWithEstate', null, null, [], false, {type: caseTypes.GOP}); - - it('test correct content loaded on the page when lead applicant does not have an alias', (done) => { - testWrapper.agent.post('/prepare-session/form') - .send(sessionData) - .end(() => { - testWrapper.testContent(done); - }); - }); - - it('test correct content loaded on the page when lead applicant does have an alias', (done) => { - sessionData.applicant.alias = 'Bobby Alias'; - testWrapper.agent.post('/prepare-session/form') - .send(sessionData) - .end(() => { - testWrapper.testContent(done); - }); - }); - - it('test errors message displayed for missing data', (done) => { - const errorsToTest = ['executorsApplying']; - - testWrapper.agent.post('/prepare-session/form') - .send(sessionData) - .end(() => { - testWrapper.testErrors(done, {}, 'required', errorsToTest); - }); - }); - - it('test errors message displayed for more than 3 additional applicants', (done) => { - const errorsToTest = ['executorsApplying']; - - testWrapper.agent.post('/prepare-session/form') - .send(sessionData) - .end(() => { - const data = { - executorsApplying: ['many clouds', 'many clouds', 'many clouds', 'many clouds'] - }; - - testWrapper.testErrors(done, data, 'invalid', errorsToTest); - }); - }); - }); -}); diff --git a/test/component/executors/testExecutorsNamed.js b/test/component/executors/testExecutorsNamed.js new file mode 100644 index 0000000000..7bc5de8440 --- /dev/null +++ b/test/component/executors/testExecutorsNamed.js @@ -0,0 +1,95 @@ +'use strict'; + +const TestWrapper = require('test/util/TestWrapper'); +const ExecutorsNames = require('app/steps/ui/executors/names'); +const Equality = require('app/steps/ui/equality'); +const testCommonContent = require('test/component/common/testCommonContent.js'); +const caseTypes = require('app/utils/CaseTypes'); + +describe('executors-named', () => { + let testWrapper, sessionData; + const expectedNextUrlForExecNames = ExecutorsNames.getUrl(); + const expectedNextUrlForEquality = Equality.getUrl(); + + beforeEach(() => { + testWrapper = new TestWrapper('ExecutorsNamed'); + sessionData = { + type: caseTypes.GOP, + ccdCase: { + state: 'Pending', + id: 1234567890123456 + }, + applicant: { + 'firstName': 'Bobby', + 'lastName': 'Applicant', + 'nameAsOnTheWill': 'optionYes', + 'isApplying': true, + 'isApplicant': true, + 'fullName': 'Bobby Applicant' + }, + executors: { + executorsNumber: 2, + list: [ + { + 'fullName': 'Fred Exec One', + 'isApplying': false + }, + { + 'fullName': 'Jeff Exec Two', + 'isApplying': false + } + ] + } + }; + }); + + afterEach(() => { + testWrapper.destroy(); + }); + + describe('Verify Content, Errors and Redirection', () => { + testCommonContent.runTest('ExecutorsNamed', null, null, [], false, {type: caseTypes.GOP}); + + it('test redirection to names page when selecting yes with multiple executors', (done) => { + const data = {executorsNamed: 'optionYes'}; + testWrapper.testRedirect(done, data, expectedNextUrlForExecNames); + }); + + it('test redirection to equality page when selecting no', (done) => { + const data = {list: [{ + 'fullName': 'Jeff Exec Two', + 'isApplying': false + }], + executorsNamed: 'optionNo'}; + testWrapper.testRedirect(done, data, expectedNextUrlForEquality); + }); + + it('test errors message displayed for no number entered', (done) => { + testWrapper.testErrors(done, {}, 'required'); + }); + + //Working on these below + it('test correct content loaded on the page when lead applicant does not have an alias', (done) => { + const contentToExclude = ['titleWithCodicil', 'hintTextWithCodicil']; + testWrapper.agent.post('/prepare-session/form') + .send(sessionData) + .end(() => { + testWrapper.testContent(done, {}, contentToExclude); + }); + }); + + it('test correct content loaded on the page when lead applicant does have an alias', (done) => { + const contentToExclude = ['titleWithCodicil', 'hintTextWithCodicil']; + sessionData.executors.list[0].fullName = 'Fred Exec One'; + testWrapper.agent.post('/prepare-session/form') + .send(sessionData) + .end(() => { + testWrapper.testContent(done, {}, contentToExclude); + }); + }); + + it('test errors message displayed for required data', (done) => { + testWrapper.testErrors(done, {}, 'required'); + }); + }); +}); diff --git a/test/component/executors/testExecutorsNames.js b/test/component/executors/testExecutorsNames.js index 176c87da62..022b84f7da 100644 --- a/test/component/executors/testExecutorsNames.js +++ b/test/component/executors/testExecutorsNames.js @@ -36,19 +36,21 @@ describe('executors-names', () => { testCommonContent.runTest('ExecutorsNames', null, null, [], false, {type: caseTypes.GOP}); it('test correct content loaded on the page when lead applicant does not have an alias', (done) => { + const idsToExclude = ['questionWithCodicil', 'paragraphWithCodicil']; testWrapper.agent.post('/prepare-session/form') .send(sessionData) .end(() => { - testWrapper.testContent(done); + testWrapper.testContent(done, {}, idsToExclude); }); }); it('test correct content loaded on the page when lead applicant does have an alias', (done) => { sessionData.executors.list[0].alias = 'Bobby Alias'; + const idsToExclude = ['questionWithCodicil', 'paragraphWithCodicil']; testWrapper.agent.post('/prepare-session/form') .send(sessionData) .end(() => { - testWrapper.testContent(done); + testWrapper.testContent(done, {}, idsToExclude); }); }); @@ -70,7 +72,7 @@ describe('executors-names', () => { .send(sessionData) .end(() => { const data = { - executorName: [''] + executorName: '' }; const errorsToTest = ['executorName']; diff --git a/test/component/executors/testExecutorsNumber.js b/test/component/executors/testExecutorsNumber.js deleted file mode 100644 index 55d9188272..0000000000 --- a/test/component/executors/testExecutorsNumber.js +++ /dev/null @@ -1,75 +0,0 @@ -'use strict'; - -const TestWrapper = require('test/util/TestWrapper'); -const Equality = require('app/steps/ui/equality'); -const ExecutorsNames = require('app/steps/ui/executors/names'); -const testCommonContent = require('test/component/common/testCommonContent.js'); -const caseTypes = require('app/utils/CaseTypes'); - -describe('executors-number', () => { - let testWrapper; - const expectedNextUrlForExecNames = ExecutorsNames.getUrl(); - const expectedNextUrlForEquality = Equality.getUrl(); - - beforeEach(() => { - testWrapper = new TestWrapper('ExecutorsNumber'); - }); - - afterEach(() => { - testWrapper.destroy(); - }); - - describe('Verify Content, Errors and Redirection', () => { - testCommonContent.runTest('ExecutorsNumber', null, null, [], false, {type: caseTypes.GOP}); - - it('test content loaded on the page', (done) => { - const sessionData = { - type: caseTypes.GOP, - ccdCase: { - state: 'Pending', - id: 1234567890123456 - } - }; - - testWrapper.agent.post('/prepare-session/form') - .send(sessionData) - .end(() => { - testWrapper.testContent(done); - }); - }); - - it('test errors message displayed for invalid data', (done) => { - const data = {executorsNumber: 'abd'}; - - testWrapper.testErrors(done, data, 'invalid'); - }); - - it('test errors message displayed for invalid data - negative numbers', (done) => { - const data = {executorsNumber: '-1'}; - - testWrapper.testErrors(done, data, 'invalid'); - }); - - it('test errors message displayed for no number entered', (done) => { - testWrapper.testErrors(done, {}, 'required'); - }); - - it('test it displays the errors when there are more than 20 executors', (done) => { - const data = {executorsNumber: 21}; - - testWrapper.testErrors(done, data, 'invalid'); - }); - - it(`test it redirects to next page: ${expectedNextUrlForExecNames}`, (done) => { - const data = {executorsNumber: 2}; - - testWrapper.testRedirect(done, data, expectedNextUrlForExecNames); - }); - - it(`test it redirects to next page when there is only one executor: ${expectedNextUrlForEquality}`, (done) => { - const data = {executorsNumber: 1}; - - testWrapper.testRedirect(done, data, expectedNextUrlForEquality); - }); - }); -}); diff --git a/test/component/executors/testExecutorsWhenDied.js b/test/component/executors/testExecutorsWhenDied.js index 4685b24a86..d84f2122b7 100644 --- a/test/component/executors/testExecutorsWhenDied.js +++ b/test/component/executors/testExecutorsWhenDied.js @@ -3,7 +3,6 @@ const initSteps = require('app/core/initSteps'); const assert = require('chai').assert; const TestWrapper = require('test/util/TestWrapper'); -const contentData = {executorFullName: 'many clouds'}; const commonContent = require('app/resources/en/translation/common'); const caseTypes = require('app/utils/CaseTypes'); @@ -53,6 +52,10 @@ describe('executors-when-died', () => { {fullName: 'many clouds', isDead: true}, {fullName: 'harvey smith', isDead: false} ] + }, + deceased: { + firstName: 'John', + lastName: 'Doe' } }; }); @@ -87,19 +90,16 @@ describe('executors-when-died', () => { testWrapper.agent.post('/prepare-session/form') .send(sessionData) .end(() => { + const contentData = {deceasedName: 'John Doe', executorFullName: 'Many Clouds'}; + testWrapper.testContent(done, contentData); }); }); it('test errors message displayed for missing data', (done) => { testWrapper.pageUrl = testWrapper.pageToTest.constructor.getUrl(1); - testWrapper.agent.post('/prepare-session/form') - .send(sessionData) - .end(() => { - const data = { - }; - testWrapper.testErrors(done, data, 'required'); - }); + const errorsToTest = ['diedbefore']; + testWrapper.testErrors(done, {}, 'required', errorsToTest); }); }); diff --git a/test/component/executors/testNotified.js b/test/component/executors/testNotified.js index 711e59346d..9fa20828de 100644 --- a/test/component/executors/testNotified.js +++ b/test/component/executors/testNotified.js @@ -52,13 +52,12 @@ describe('executor-notified', () => { }); it('test right content loaded on the page', (done) => { - + testWrapper.pageUrl = testWrapper.pageToTest.constructor.getUrl(1); testWrapper.agent.post('/prepare-session/form') .send(sessionData) .end(() => { const contentData = {executorName: 'Manah Mana'}; - testWrapper.pageUrl = testWrapper.pageToTest.constructor.getUrl(1); testWrapper.testContent(done, contentData); }); }); diff --git a/test/component/executors/testRoles.js b/test/component/executors/testRoles.js index a6c96f0275..2948d85bf9 100644 --- a/test/component/executors/testRoles.js +++ b/test/component/executors/testRoles.js @@ -71,7 +71,7 @@ describe('executor-roles', () => { .send(sessionData) .end(() => { const contentData = { - executorFullName: 'Mana Manah', + executorName: 'Mana Manah', applicationFormPA15: config.links.applicationFormPA15 }; @@ -81,17 +81,9 @@ describe('executor-roles', () => { }); it('test schema validation when executor is not applying', (done) => { - testWrapper.agent.post('/prepare-session/form') - .send(sessionData) - .end(() => { - const errorsToTest = ['notApplyingReason']; - const data = { - notApplyingReason: null - }; - - testWrapper.pageUrl = testWrapper.pageToTest.constructor.getUrl(1); - testWrapper.testErrors(done, data, 'required', errorsToTest); - }); + testWrapper.pageUrl = testWrapper.pageToTest.constructor.getUrl(1); + const errorsToTest = ['notApplyingReason']; + testWrapper.testErrors(done, {}, 'required', errorsToTest); }); }); diff --git a/test/component/summary/testExecutorsSection.js b/test/component/summary/testExecutorsSection.js index 31fb3c702d..851d6c52d2 100644 --- a/test/component/summary/testExecutorsSection.js +++ b/test/component/summary/testExecutorsSection.js @@ -132,7 +132,6 @@ describe('summary-executor-section', () => { testWrapper.testDataPlayback(done, playbackData); }); }); - it('test data is played back correctly on the summary page executors section', (done) => { const executorsData = require('test/data/summary-executors'); @@ -148,7 +147,7 @@ describe('summary-executor-section', () => { questionLastName: applicantNameContent.lastName, questionPhoneNumber: applicantPhoneContent.phoneNumber, questionApplicantAddress: applicantAddressContent.question, - questionExecutorsAllAlive: executorsAllAliveContent.question, + questionExecutorsAllAlive: executorsAllAliveContent.multipleExecutorQuestion, allAlive: executorsAllAliveContent[executorsData.executors.allAlive], @@ -160,7 +159,7 @@ describe('summary-executor-section', () => { exec3fullName: executorsData.executors.list[2].fullName, exec3IsApplying: executorsData.executors.list[2].isApplying ? executorsApplyingContent.optionYes : executorsApplyingContent.optionNo, - exec3NotApplyingReason: executorsRoles[executorsData.executors.list[2].notApplyingReason], + exec3NotApplyingReason: executorsRoles[executorsData.executors.list[2].notApplyingReason].replace('{executorName}', executorsData.executors.list[2].fullName), exec4fullName: executorsData.executors.list[3].fullName, exec4IsApplying: executorsData.executors.list[3].isApplying ? executorsApplyingContent.optionYes : executorsApplyingContent.optionNo, @@ -171,7 +170,6 @@ describe('summary-executor-section', () => { playbackData.address = executorsData.applicant.address.formattedAddress; playbackData.nameAsOnTheWill = applicantNameAsOnWillContent[playbackData.nameAsOnTheWill]; playbackData.aliasReason = applicantAliasReasonContent[playbackData.aliasReason]; - testWrapper.testDataPlayback(done, playbackData); }); }); diff --git a/test/data/complete-form-will-condition-toggle-on.json b/test/data/complete-form-will-condition-toggle-on.json index 13b9e0524c..60162d23cf 100644 --- a/test/data/complete-form-will-condition-toggle-on.json +++ b/test/data/complete-form-will-condition-toggle-on.json @@ -92,6 +92,7 @@ { "fullName": "Number 2", "isApplying": true, + "hasOtherName": false, "email": "test@email.com", "mobile": "07234156431", "address": { @@ -108,8 +109,9 @@ } ], "executorsNumber": 2, + "executorsNamed": "optionNo", "invitesSent": "true", - "allalive": "optionYes", + "allalive": "optionNo", "otherExecutorsApplying": "optionYes", "alias": "optionNo", "mentalCapacity": "optionYes" diff --git a/test/data/complete-form.json b/test/data/complete-form.json index c2a521bc48..16ae41de3d 100644 --- a/test/data/complete-form.json +++ b/test/data/complete-form.json @@ -93,6 +93,9 @@ "isApplying": true, "email": "test@email.com", "mobile": "07234156431", + "hasOtherName": true, + "currentName": "Number 2", + "currentNameReason": "optionMarriage", "address": { "addressLine1": "21 Treelined Avenue", "addressLine2": "", @@ -107,8 +110,9 @@ } ], "executorsNumber": 2, + "executorsNamed": "optionNo", "invitesSent": "true", - "allalive": "optionYes", + "allalive": "optionNo", "otherExecutorsApplying": "optionYes", "alias": "optionNo", "mentalCapacity": "optionYes" diff --git a/test/data/summary-executors.json b/test/data/summary-executors.json index a5a7cd1fe7..4143eacbf3 100644 --- a/test/data/summary-executors.json +++ b/test/data/summary-executors.json @@ -9,8 +9,10 @@ }, "executors": { - "executorsNumber": 3, + "executorsNamed": "optionNo", + "executorsNumber": 3, "otherExecutorsApplying": "optionYes", + "executorsApplying": ["dean plummer", "sam simms"], "allAlive": "optionNo", "list": [ { diff --git a/test/unit/executors/testExecutorCurrentName.js b/test/unit/executors/testExecutorCurrentName.js index 1190d1bc85..c761f7be4b 100644 --- a/test/unit/executors/testExecutorCurrentName.js +++ b/test/unit/executors/testExecutorCurrentName.js @@ -93,7 +93,7 @@ describe('ExecutorCurrentName', () => { }; const ExecutorCurrentName = steps.ExecutorCurrentName; const nextStepUrl = ExecutorCurrentName.nextStepUrl(req, ctx); - expect(nextStepUrl).to.equal('/executor-current-name-reason/1'); + expect(nextStepUrl).to.equal('/executor-name-reason/1'); done(); }); }); diff --git a/test/unit/executors/testExecutorCurrentNameReason.js b/test/unit/executors/testExecutorCurrentNameReason.js index 4ed3775640..cd777eef75 100644 --- a/test/unit/executors/testExecutorCurrentNameReason.js +++ b/test/unit/executors/testExecutorCurrentNameReason.js @@ -6,7 +6,7 @@ const initSteps = require('app/core/initSteps'); const {assert, expect} = require('chai'); const ExecutorsWrapper = require('app/wrappers/Executors'); const journey = require('app/journeys/probate'); -const executorCurrentNameReasonPath = '/executor-current-name-reason/'; +const executorCurrentNameReasonPath = '/executor-name-reason/'; describe('ExecutorCurrentNameReason', () => { const steps = initSteps([`${__dirname}/../../../app/steps/action/`, `${__dirname}/../../../app/steps/ui`]); @@ -87,13 +87,13 @@ describe('ExecutorCurrentNameReason', () => { it('sets the index when startsWith(req.path, path)', (done) => { const req = { - path: '/executor-current-name-reason/', + path: '/executor-name-reason/', session: { form: { executors: { list: [ - {currentName: 'executor current name', hasOtherName: true}, - {currentName: 'bob smith', hasOtherName: true} + {currentName: 'executor current name', isApplying: true, hasOtherName: true}, + {currentName: 'bob smith', isApplying: true, hasOtherName: true} ] } } @@ -255,7 +255,7 @@ describe('ExecutorCurrentNameReason', () => { }, { isApplying: true }], - index: -1, + index: 1, executorsWrapper: new ExecutorsWrapper(), currentNameReason: 'optionMarriage' }); @@ -275,7 +275,7 @@ describe('ExecutorCurrentNameReason', () => { }; const index = ExecutorCurrentNameReason.recalcIndex(testCtx, 0); - expect(index).to.equal(2); + expect(index).to.equal(1); done(); }); @@ -318,7 +318,7 @@ describe('ExecutorCurrentNameReason', () => { }; const ExecutorCurrentNameReason = steps.ExecutorCurrentNameReason; const nextStepUrl = ExecutorCurrentNameReason.nextStepUrl(req, ctx); - expect(nextStepUrl).to.equal('/executor-current-name/1'); + expect(nextStepUrl).to.equal('/executors-alias/1'); done(); }); }); @@ -374,4 +374,37 @@ describe('ExecutorCurrentNameReason', () => { done(); }); }); + describe('ExecutorCurrentNameReason isComplete', () => { + let ctx; + + beforeEach(() => { + ctx = { + list: [ + {fullName: 'Executor 1', hasOtherName: true, currentNameReason: 'Reason 1'}, + {fullName: 'Executor 2', hasOtherName: true, currentNameReason: 'Reason 2'}, + {fullName: 'Executor 3', hasOtherName: false} + ] + }; + }); + + it('should return inProgress if all executors with another name have a current name reason', () => { + const result = ExecutorCurrentNameReason.isComplete(ctx); + expect(result).to.deep.equal([true, 'inProgress']); + }); + + it('should return inProgress if no executors have another name', () => { + ctx.list = [ + {fullName: 'Executor 1', hasOtherName: false}, + {fullName: 'Executor 2', hasOtherName: false} + ]; + const result = ExecutorCurrentNameReason.isComplete(ctx); + expect(result).to.deep.equal([true, 'inProgress']); + }); + + it('should return inProgress if executors list is empty', () => { + ctx.list = []; + const result = ExecutorCurrentNameReason.isComplete(ctx); + expect(result).to.deep.equal([true, 'inProgress']); + }); + }); }); diff --git a/test/unit/executors/testExecutorNames.js b/test/unit/executors/testExecutorNames.js index a989402f6e..d0ebf0423c 100644 --- a/test/unit/executors/testExecutorNames.js +++ b/test/unit/executors/testExecutorNames.js @@ -50,4 +50,27 @@ describe('ExecutorsNames', () => { done(); }); }); + describe('handlePost', () => { + it('should initialize ctx.list if it does not exist', () => { + const ctx = {}; + const errors = []; + ExecutorsNames.handlePost(ctx, errors); + expect(ctx.list).to.deep.equal([]); + }); + + it('should add executorName to ctx.list if executorName exists and is not empty', () => { + const ctx = {executorName: 'John Doe'}; + const errors = []; + ExecutorsNames.handlePost(ctx, errors); + expect(ctx.list).to.deep.equal([{fullName: 'John Doe'}]); + }); + }); + describe('action', () => { + it('should delete applicantCurrentName and executorName from ctx', () => { + const ctx = {applicantCurrentName: 'John Doe', executorName: 'Jane Doe'}; + const formdata = {}; + const result = ExecutorsNames.action(ctx, formdata); + expect(result).to.deep.equal([{}, formdata]); + }); + }); }); diff --git a/test/unit/executors/testExecutorNotified.js b/test/unit/executors/testExecutorNotified.js index 79aaee4ffb..1663f5363e 100644 --- a/test/unit/executors/testExecutorNotified.js +++ b/test/unit/executors/testExecutorNotified.js @@ -77,4 +77,33 @@ describe('ExecutorNotified', () => { assert.isUndefined(ctx.nextExecutor); }); }); + describe('ExecutorNotified generateFields', () => { + let ctx; + let errors; + let language; + + beforeEach(() => { + ctx = { + list: [ + {fullName: 'Executor 1', isDead: false}, + {fullName: 'Executor 2', isDead: false} + ], + executorName: 'Executor 1', + index: 0 + }; + errors = [{msg: 'Error message for {executorName}'}]; + language = 'en'; + }); + + it('should replace {executorName} placeholder in error message if executorName is present', () => { + ExecutorNotified.generateFields(language, ctx, errors); + expect(errors[0].msg).to.equal('Error message for Executor 1'); + }); + + it('should not modify error message if executorName is not present in fields', () => { + ctx.executorName = ''; + ExecutorNotified.generateFields(language, ctx, errors); + expect(errors[0].msg).to.equal('Error message for '); + }); + }); }); diff --git a/test/unit/executors/testExecutorWhenDied.js b/test/unit/executors/testExecutorWhenDied.js index 8fa3f90f25..6f77373ca4 100644 --- a/test/unit/executors/testExecutorWhenDied.js +++ b/test/unit/executors/testExecutorWhenDied.js @@ -78,4 +78,66 @@ describe('ExecutorWhenDied', () => { assert.isUndefined(ctx.allDead); }); }); + describe('ExecutorsWhenDied generateFields', () => { + let ctx; + let errors; + let language; + + beforeEach(() => { + ctx = { + list: [ + {fullName: 'Executor 1', isDead: true}, + {fullName: 'Executor 2', isDead: false} + ], + deceasedName: 'Deceased Name', + executorFullName: 'Executor 1' + }; + errors = [{msg: 'Error message for {deceasedName} and {executorName}'}]; + language = 'en'; + }); + + it('should replace {deceasedName} and {executorName} placeholders in error message', () => { + ExecutorWhenDied.generateFields(language, ctx, errors); + expect(errors[0].msg).to.equal('Error message for Deceased Name and Executor 1'); + }); + + it('should not modify error message if executorFullName is not present in fields', () => { + ctx.executorFullName = ''; + ExecutorWhenDied.generateFields(language, ctx, errors); + expect(errors[0].msg).to.equal('Error message for Deceased Name and '); + }); + }); + describe('ExecutorsWhenDied isComplete', () => { + let ctx; + + beforeEach(() => { + ctx = { + list: [ + {fullName: 'Executor 1', isDead: true, diedBefore: 'optionYes'}, + {fullName: 'Executor 2', isDead: true, diedBefore: 'optionNo'}, + {fullName: 'Executor 3', isDead: false} + ] + }; + }); + + it('should return inProgress if all dead executors have diedBefore property', () => { + const result = ExecutorWhenDied.isComplete(ctx); + expect(result).to.deep.equal([true, 'inProgress']); + }); + + it('should return inProgress if no executors are dead', () => { + ctx.list = [ + {fullName: 'Executor 1', isDead: false}, + {fullName: 'Executor 2', isDead: false} + ]; + const result = ExecutorWhenDied.isComplete(ctx); + expect(result).to.deep.equal([true, 'inProgress']); + }); + + it('should return inProgress if executors list is empty', () => { + ctx.list = []; + const result = ExecutorWhenDied.isComplete(ctx); + expect(result).to.deep.equal([true, 'inProgress']); + }); + }); }); diff --git a/test/unit/executors/testExecutorsAlias.js b/test/unit/executors/testExecutorsAlias.js index b55e2391f6..d1594587a9 100644 --- a/test/unit/executors/testExecutorsAlias.js +++ b/test/unit/executors/testExecutorsAlias.js @@ -9,7 +9,7 @@ describe('Executors-Alias', () => { describe('getUrl()', () => { it('should return the correct url', (done) => { const url = ExecutorsAlias.constructor.getUrl(); - expect(url).to.equal('/executors-alias'); + expect(url).to.equal('/executors-alias/*'); done(); }); }); @@ -21,8 +21,8 @@ describe('Executors-Alias', () => { ctx = { alias: 'optionNo', list: [ - {fullName: 'Ronnie D', hasOtherName: true, currentName: 'Steve', currentNameReason: 'optionMarriage'}, - {fullName: 'Aggie D', hasOtherName: true, currentName: 'Danny', currentNameReason: 'optionOther', otherReason: 'Yolo'} + {fullName: 'Ronnie D', hasOtherName: false, currentName: 'Steve', currentNameReason: 'optionMarriage'}, + {fullName: 'Aggie D', hasOtherName: false, currentName: 'Danny', currentNameReason: 'optionOther', otherReason: 'Yolo'} ] }; ctx = ExecutorsAlias.pruneFormData(ctx); @@ -55,4 +55,155 @@ describe('Executors-Alias', () => { done(); }); }); + + describe('ExecutorsAlias handleGet', () => { + let ctx; + + beforeEach(() => { + ctx = { + list: [ + {fullName: 'Executor 1', hasOtherName: false}, + {fullName: 'Executor 2', hasOtherName: true}, + {fullName: 'Executor 3'} + ], + index: 0 + }; + }); + + it('should set alias to optionYes if executor has other name', () => { + ctx.index = 1; + [ctx] = ExecutorsAlias.handleGet(ctx); + expect(ctx.alias).to.equal('optionYes'); + }); + + it('should set alias to optionNo if executor does not have other name', () => { + ctx.index = 0; + [ctx] = ExecutorsAlias.handleGet(ctx); + expect(ctx.alias).to.equal('optionNo'); + }); + + it('should set alias to empty string if executor hasOtherName is not defined', () => { + ctx.index = 2; + [ctx] = ExecutorsAlias.handleGet(ctx); + expect(ctx.alias).to.equal(''); + }); + }); + describe('ExecutorsAlias nextStepUrl', () => { + let ctx; + let req; + beforeEach(() => { + ctx = { + alias: '', + index: 0, + list: [ + {fullName: 'Executor 1', isApplying: true}, + {fullName: 'Executor 2', isApplying: true} + ] + }; + req = {}; + }); + + it('should return the URL for the next executor if alias is optionNo and there is another executor', () => { + ctx.alias = 'optionNo'; + const url = ExecutorsAlias.nextStepUrl(req, ctx); + expect(url).to.equal('/executors-alias/1'); + }); + + it('should return the URL for executor contact details if alias is optionNo and there are no more executors', () => { + ctx.alias = 'optionNo'; + ctx.index = 1; + const url = ExecutorsAlias.nextStepUrl(req, ctx); + expect(url).to.equal('/executor-contact-details/1'); + }); + + it('should return the URL for executor ID name if alias is optionYes', () => { + ctx.alias = 'optionYes'; + const url = ExecutorsAlias.nextStepUrl(req, ctx); + expect(url).to.equal('/executor-id-name/0'); + }); + }); + describe('ExecutorsAlias generateFields', () => { + let ctx; + let errors; + let language; + + beforeEach(() => { + ctx = { + list: [ + {fullName: 'Executor 1', hasOtherName: false}, + {fullName: 'Executor 2', hasOtherName: true} + ], + otherExecName: 'Executor 2' + }; + errors = [{msg: 'Error message for {executorName}'}]; + language = 'en'; + }); + + it('should replace {executorName} placeholder in error message with executor name', () => { + ExecutorsAlias.generateFields(language, ctx, errors); + expect(errors[0].msg).to.equal('Error message for Executor 2'); + }); + + it('should not modify error message if otherExecName is not present in fields', () => { + ctx.otherExecName = ''; + ExecutorsAlias.generateFields(language, ctx, errors); + expect(errors[0].msg).to.equal('Error message for '); + }); + }); + describe('isComplete', () => { + it('returns true and inProgress when all executors are valid', () => { + const ctx = { + list: [ + {fullName: 'Executor one', isApplying: true, hasOtherName: true, currentName: 'John Doe', currentNameReason: 'Legal'}, + {fullName: 'Executor one', isApplying: true, hasOtherName: false} + ] + }; + const result = ExecutorsAlias.isComplete(ctx); + expect(result).to.deep.equal([true, 'inProgress']); + }); + + it('returns false and inProgress when an executor with other name is missing currentName', () => { + const ctx = { + list: [ + {fullName: 'Executor one', isApplying: true, hasOtherName: true, currentNameReason: 'Legal'}, + {fullName: 'Executor one', isApplying: true, hasOtherName: false} + ] + }; + const result = ExecutorsAlias.isComplete(ctx); + expect(result).to.deep.equal([false, 'inProgress']); + }); + + it('returns false and inProgress when an executor with other name is missing currentNameReason', () => { + const ctx = { + list: [ + {fullName: 'Executor one', isApplying: true, hasOtherName: true, currentName: 'John Doe'}, + {fullName: 'Executor one', isApplying: true, hasOtherName: false} + ] + }; + const result = ExecutorsAlias.isComplete(ctx); + expect(result).to.deep.equal([false, 'inProgress']); + }); + + it('returns false and inProgress when an executor with other name is missing both currentName and currentNameReason', () => { + const ctx = { + list: [ + {fullName: 'Executor one', isApplying: true, hasOtherName: true}, + {fullName: 'Executor one', isApplying: true, hasOtherName: false} + ] + }; + const result = ExecutorsAlias.isComplete(ctx); + expect(result).to.deep.equal([false, 'inProgress']); + }); + + it('returns true and inProgress when all executors have hasOtherName as false', () => { + const ctx = { + list: [ + {fullName: 'Executor one', isApplying: true, hasOtherName: false}, + {fullName: 'Executor one', isApplying: true, hasOtherName: false} + ] + }; + const result = ExecutorsAlias.isComplete(ctx); + expect(result).to.deep.equal([true, 'inProgress']); + }); + }); }); diff --git a/test/unit/executors/testExecutorsAllAlive.js b/test/unit/executors/testExecutorsAllAlive.js index 3e297dca04..e2435e4d07 100644 --- a/test/unit/executors/testExecutorsAllAlive.js +++ b/test/unit/executors/testExecutorsAllAlive.js @@ -8,7 +8,7 @@ const ExecutorsAllAlive = steps.ExecutorsAllAlive; describe('ExecutorsAllAlive', () => { describe('nextStepUrl()', () => { - it('should return url for the next step if all the excutors are alive', (done) => { + it('should return url for the next step if all the executors are not alive', (done) => { const req = { session: { journey: journey @@ -18,11 +18,11 @@ describe('ExecutorsAllAlive', () => { allalive: 'optionYes' }; const nextStepUrl = ExecutorsAllAlive.nextStepUrl(req, ctx); - expect(nextStepUrl).to.equal('/other-executors-applying'); + expect(nextStepUrl).to.equal('/executors-who-died'); done(); }); - it('should return url for the next step if all the executors are not alive', (done) => { + it('should return url for the next step if all the executors are alive', (done) => { const req = { session: { journey: journey @@ -32,7 +32,7 @@ describe('ExecutorsAllAlive', () => { allalive: 'optionNo' }; const nextStepUrl = ExecutorsAllAlive.nextStepUrl(req, ctx); - expect(nextStepUrl).to.equal('/executors-who-died'); + expect(nextStepUrl).to.equal('/other-executors-applying'); done(); }); }); diff --git a/test/unit/executors/testExecutorsApplying.js b/test/unit/executors/testExecutorsApplying.js index e3a52cd6f0..5db56773d8 100644 --- a/test/unit/executors/testExecutorsApplying.js +++ b/test/unit/executors/testExecutorsApplying.js @@ -1,9 +1,12 @@ 'use strict'; const initSteps = require('app/core/initSteps'); +const {expect} = require('chai'); const assert = require('chai').assert; describe('Executors-Applying', () => { let ctx; + let errors; + let data; const ExecsApplying = initSteps([`${__dirname}/../../../app/steps/action/`, `${__dirname}/../../../app/steps/ui`]).ExecutorsApplying; describe('handlePost', () => { @@ -28,18 +31,235 @@ describe('Executors-Applying', () => { }; }); - it('test executor isApplying flag is deleted when No option is selected', () => { - ctx.otherExecutorsApplying = 'optionNo'; + it('test executor isApplying flag is deleted when no executor is applying', () => { + ctx.executorsApplying = []; ExecsApplying.handlePost(ctx); assert.isUndefined(ctx.list[1].isApplying); assert.isUndefined(ctx.list[2].isApplying); }); - it('test executor isApplying flag is true when Yes option selected', () => { - ctx.otherExecutorsApplying = 'optionYes'; + it('test executor isApplying flag is true when multiple executors are applying', () => { + ctx.executorsApplying = ['Ed Brown', 'Dave Miller']; ExecsApplying.handlePost(ctx); assert.isTrue(ctx.list[1].isApplying); assert.isTrue(ctx.list[2].isApplying); }); + it('test executor isApplying flag is true when single executor is applying', () => { + ctx.list= [ + { + lastName: 'the', + firstName: 'applicant', + isApplying: true, + isApplicant: true + }, { + isApplying: true, + fullName: 'Ed Brown', + address: '20 Green Street, London, L12 9LN' + } + ]; + ctx.otherExecutorsApplying = 'optionYes'; + ExecsApplying.handlePost(ctx); + assert.isTrue(ctx.list[1].isApplying); + }); + it('test executor isApplying flag is false when single executor is not applying', () => { + ctx.list= [ + { + lastName: 'the', + firstName: 'applicant', + isApplying: true, + isApplicant: true + }, { + isApplying: true, + fullName: 'Ed Brown', + address: '20 Green Street, London, L12 9LN' + } + ]; + ctx.otherExecutorsApplying = 'optionNo'; + [ctx, errors] = ExecsApplying.handlePost(ctx); + assert.isUndefined(ctx.list[1].isApplying); + assert.isEmpty(errors); + }); + it('should add an error if applyingCount is greater than 4', () => { + ctx.list.push({fullName: 'Executor 3', isApplying: true}); + ctx.list.push({fullName: 'Executor 4', isApplying: true}); + ctx.executorsApplying = ['Ed Brown', 'Dave Miller', 'Executor 3', 'Executor 4']; + const invalid = 'You can not select more than 4 executors'; + + [ctx, errors] = ExecsApplying.handlePost(ctx, errors, {}, {language: 'en'}); + + expect(errors).to.deep.equal([ + { + field: 'executorsApplying', + href: '#executorsApplying', + msg: invalid + } + ]); + }); + + it('should not add an error if applyingCount is 4 or less', () => { + ctx.list.push({fullName: 'Executor 3', isApplying: true}); + ctx.list.push({fullName: 'Executor 4', isApplying: true}); + ctx.executorsApplying = ['Ed Brown', 'Dave Miller']; + + [ctx, errors] = ExecsApplying.handlePost(ctx); + + expect(errors).to.deep.equal([]); + }); + }); + + describe('getContextData()', () => { + let req; + beforeEach(() => { + req = { + session: { + form: { + applicant: { + firstName: 'Robert', + lastName: 'Bruce', + nameAsOnTheWill: 'optionYes', + phone: '075345435345', + address: '102 Petty France' + }, + executors: { + list: [ + { + 'lastName': 'Bruce', + 'firstName': 'Robert', + 'isApplying': 'optionYes', + 'isApplicant': true + }, { + isApplying: true, + fullName: 'Ed Brown', + address: '20 Green Street, London, L12 9LN' + }, { + isApplying: true, + fullName: 'Dave Miller', + address: '102 Petty Street, London, L12 9LN' + } + ] + } + } + } + }; + }); + + it('should set the formatted lead applicant name as the option when there is no Applicant Alias', (done) => { + ctx = ExecsApplying.getContextData(req); + expect(ctx.options).to.deep.equal([ + {text: 'Robert Bruce', value: 'Robert Bruce', checked: true, disabled: true}, + {text: 'Ed Brown', value: 'Ed Brown', checked: true}, + {text: 'Dave Miller', value: 'Dave Miller', checked: true} + ]); + done(); + }); + + it('should set the lead applicant alias as the option when the Applicant Alias is set', (done) => { + req.session.form.applicant.alias = 'Bobby Alias'; + ctx = ExecsApplying.getContextData(req); + expect(ctx.options).to.deep.equal([ + {text: 'Bobby Alias', value: 'Bobby Alias', checked: true, disabled: true}, + {text: 'Ed Brown', value: 'Ed Brown', checked: true}, + {text: 'Dave Miller', value: 'Dave Miller', checked: true} + ]); + done(); + }); + + it('should set checked to false when isApplying is false for other executor', (done) => { + req.session.form.executors.list[1].isApplying = false; + ctx = ExecsApplying.getContextData(req); + expect(ctx.options).to.deep.equal([ + {text: 'Robert Bruce', value: 'Robert Bruce', checked: true, disabled: true}, + {text: 'Ed Brown', value: 'Ed Brown', checked: false}, + {text: 'Dave Miller', value: 'Dave Miller', checked: true} + ]); + done(); + }); + }); + + describe('pruneExecutorData', () => { + it('test that isApplying flag is deleted when executor is not applying', () => { + data = { + fullName: 'Ed Brown', + isApplying: false + }; + ExecsApplying.pruneExecutorData(data); + assert.isUndefined(data.isApplying); + expect(data).to.deep.equal({fullName: 'Ed Brown'}); + }); + + it('test that notApplying data is pruned when executor is applying', () => { + data = { + fullName: 'Ed Brown', + isApplying: true, + isDead: 'not sure', + diedBefore: 'not sure', + notApplyingReason: 'not sure', + notApplyingKey: 'not sure' + }; + ExecsApplying.pruneExecutorData(data); + expect(data).to.deep.equal({ + fullName: 'Ed Brown', + isApplying: true + }); + }); + + const ctx = { + 'list': [ + { + 'lastName': 'Applicant', + 'firstName': 'Main', + 'isApplying': true, + 'isApplicant': true + }, + { + 'email': 'probate0@mailinator.com', + 'mobile': '07900123456', + 'address': 'Princes house address', + 'postcode': 'NW1 8SS', + 'fullName': 'Prince Rogers Nelson', + 'hasOtherName': true, + 'currentName': 'Prince', + 'isApplying': false, + 'notApplyingKey': 'optionRenunciated', + 'notApplyingReason': 'optionRenunciated', + 'currentNameReason': 'Divorce', + } + ] + }; + + it('removes email from data if isApplying is false', () => { + const data = ExecsApplying.pruneExecutorData(ctx.list[1]); + assert.isUndefined(data.email); + }); + + it('removes mobile from data if isApplying is false', () => { + const data = ExecsApplying.pruneExecutorData(ctx.list[1]); + assert.isUndefined(data.mobile); + }); + + it('removes address from data if isApplying is false', () => { + const data = ExecsApplying.pruneExecutorData(ctx.list[1]); + assert.isUndefined(data.address); + }); + + it('removes postcode from data if isApplying is false', () => { + const data = ExecsApplying.pruneExecutorData(ctx.list[1]); + assert.isUndefined(data.postcode); + }); + + it('removes currentName from data if isApplying is false', () => { + const data = ExecsApplying.pruneExecutorData(ctx.list[1]); + assert.isUndefined(data.currentName); + }); + + it('removes hasOtherName from data if isApplying is false', () => { + const data = ExecsApplying.pruneExecutorData(ctx.list[1]); + assert.isUndefined(data.hasOtherName); + }); + + it('removes currentNameReason from data if isApplying is false', () => { + const data = ExecsApplying.pruneExecutorData(ctx.list[1]); + assert.isUndefined(data.currentNameReason); + }); }); }); diff --git a/test/unit/executors/testExecutorsDealing.js b/test/unit/executors/testExecutorsDealing.js deleted file mode 100644 index 33cf7216a7..0000000000 --- a/test/unit/executors/testExecutorsDealing.js +++ /dev/null @@ -1,228 +0,0 @@ -'use strict'; - -const initSteps = require('app/core/initSteps'); -const {expect, assert} = require('chai'); - -describe('Executors-Applying', () => { - let ctx; - let ctxTest; - let data; - let errors; - const ExecsDealing = initSteps([`${__dirname}/../../../app/steps/action/`, `${__dirname}/../../../app/steps/ui`]).ExecutorsDealingWithEstate; - - describe('getContextData()', () => { - let req; - beforeEach(() => { - req = { - session: { - form: { - applicant: { - firstName: 'Robert', - lastName: 'Bruce', - nameAsOnTheWill: 'optionYes', - phone: '075345435345', - address: '102 Petty France' - }, - executors: { - list: [ - { - 'lastName': 'Bruce', - 'firstName': 'Robert', - 'isApplying': 'optionYes', - 'isApplicant': true - }, { - isApplying: true, - fullName: 'Ed Brown', - address: '20 Green Street, London, L12 9LN' - }, { - isApplying: true, - fullName: 'Dave Miller', - address: '102 Petty Street, London, L12 9LN' - } - ] - } - } - } - }; - }); - - it('should set the formatted lead applicant name as the option when there is no Applicant Alias', (done) => { - ctx = ExecsDealing.getContextData(req); - expect(ctx.options).to.deep.equal([ - {text: 'Robert Bruce', value: 'Robert Bruce', checked: true, disabled: true}, - {text: 'Ed Brown', value: 'Ed Brown', checked: true}, - {text: 'Dave Miller', value: 'Dave Miller', checked: true} - ]); - done(); - }); - - it('should set the lead applicant alias as the option when the Applicant Alias is set', (done) => { - req.session.form.applicant.alias = 'Bobby Alias'; - ctx = ExecsDealing.getContextData(req); - expect(ctx.options).to.deep.equal([ - {text: 'Bobby Alias', value: 'Bobby Alias', checked: true, disabled: true}, - {text: 'Ed Brown', value: 'Ed Brown', checked: true}, - {text: 'Dave Miller', value: 'Dave Miller', checked: true} - ]); - done(); - }); - - it('should set checked to false when isApplying is false for other executor', (done) => { - req.session.form.executors.list[1].isApplying = false; - ctx = ExecsDealing.getContextData(req); - expect(ctx.options).to.deep.equal([ - {text: 'Robert Bruce', value: 'Robert Bruce', checked: true, disabled: true}, - {text: 'Ed Brown', value: 'Ed Brown', checked: false}, - {text: 'Dave Miller', value: 'Dave Miller', checked: true} - ]); - done(); - }); - }); - - describe('pruneExecutorData', () => { - it('test that isApplying flag is deleted when executor is not applying', () => { - data = { - fullName: 'Ed Brown', - isApplying: false - }; - ExecsDealing.pruneExecutorData(data); - assert.isUndefined(data.isApplying); - expect(data).to.deep.equal({fullName: 'Ed Brown'}); - }); - - it('test that notApplying data is pruned when executor is applying', () => { - data = { - fullName: 'Ed Brown', - isApplying: true, - isDead: 'not sure', - diedBefore: 'not sure', - notApplyingReason: 'not sure', - notApplyingKey: 'not sure' - }; - ExecsDealing.pruneExecutorData(data); - expect(data).to.deep.equal({ - fullName: 'Ed Brown', - isApplying: true - }); - }); - - const ctx = { - 'list': [ - { - 'lastName': 'Applicant', - 'firstName': 'Main', - 'isApplying': true, - 'isApplicant': true - }, - { - 'email': 'probate0@mailinator.com', - 'mobile': '07900123456', - 'address': 'Princes house address', - 'postcode': 'NW1 8SS', - 'fullName': 'Prince Rogers Nelson', - 'hasOtherName': true, - 'currentName': 'Prince', - 'isApplying': false, - 'notApplyingKey': 'optionRenunciated', - 'notApplyingReason': 'optionRenunciated', - 'currentNameReason': 'Divorce', - } - ] - }; - - it('removes email from data if isApplying is false', () => { - const data = ExecsDealing.pruneExecutorData(ctx.list[1]); - assert.isUndefined(data.email); - }); - - it('removes mobile from data if isApplying is false', () => { - const data = ExecsDealing.pruneExecutorData(ctx.list[1]); - assert.isUndefined(data.mobile); - }); - - it('removes address from data if isApplying is false', () => { - const data = ExecsDealing.pruneExecutorData(ctx.list[1]); - assert.isUndefined(data.address); - }); - - it('removes postcode from data if isApplying is false', () => { - const data = ExecsDealing.pruneExecutorData(ctx.list[1]); - assert.isUndefined(data.postcode); - }); - - it('removes currentName from data if isApplying is false', () => { - const data = ExecsDealing.pruneExecutorData(ctx.list[1]); - assert.isUndefined(data.currentName); - }); - - it('removes hasOtherName from data if isApplying is false', () => { - const data = ExecsDealing.pruneExecutorData(ctx.list[1]); - assert.isUndefined(data.hasOtherName); - }); - - it('removes currentNameReason from data if isApplying is false', () => { - const data = ExecsDealing.pruneExecutorData(ctx.list[1]); - assert.isUndefined(data.currentNameReason); - }); - }); - - describe('handlePost', () => { - beforeEach(() => { - ctxTest = { - list: [ - { - 'lastName': 'the', - 'firstName': 'applicant', - 'isApplying': 'optionYes', - 'isApplicant': true - }, - { - fullName: 'Ed Brown', - address: '20 Green Street, London, L12 9LN' - }, - { - fullName: 'Dave Miller', - address: '102 Petty Street, London, L12 9LN' - }, - { - email: 'probate0@mailinator.com', - mobile: '07900123456', - address: 'cher address', - fullName: 'Cher', - isApplying: false, - notApplyingKey: 'optionRenunciated', - notApplyingReason: 'optionRenunciated' - } - ], - executorsApplying: ['Dave Miller'], - executorsNumber: 4 - }; - }); - - it('test executors (with checkbox unchecked) isApplying flag is deleted', () => { - [ctx, errors] = ExecsDealing.handlePost(ctxTest); - assert.isUndefined(ctx.list[1].isApplying); - assert.isUndefined(errors); - }); - - it('test executors (with checkbox checked) isApplying flag is set to true', () => { - [ctx, errors] = ExecsDealing.handlePost(ctxTest); - assert.isTrue(ctx.list[2].isApplying); - assert.isUndefined(errors); - }); - - it('should prune executor 3 data', () => { - [ctx, errors] = ExecsDealing.handlePost(ctxTest); - assert.isUndefined(ctx.list[3].isApplying); - assert.isUndefined(ctx.list[3].address); - assert.isUndefined(errors); - }); - - it('should not prune executor 2 data', () => { - [ctx, errors] = ExecsDealing.handlePost(ctxTest); - expect(ctx.list[2].isApplying).to.equal(true); - expect(ctx.list[2].address).to.equal('102 Petty Street, London, L12 9LN'); - assert.isUndefined(errors); - }); - }); -}); diff --git a/test/unit/executors/testExecutorsNamed.js b/test/unit/executors/testExecutorsNamed.js new file mode 100644 index 0000000000..12d79f97de --- /dev/null +++ b/test/unit/executors/testExecutorsNamed.js @@ -0,0 +1,213 @@ +'use strict'; +const initSteps = require('app/core/initSteps'); +const {expect, assert} = require('chai'); +const content = require('../../../app/resources/en/translation/executors/named.json'); +const steps = initSteps([`${__dirname}/../../../app/steps/action/`, `${__dirname}/../../../app/steps/ui`]); +const ExecutorsNamed = steps.ExecutorsNamed; + +describe('ExecutorsNamed', () => { + + describe('getUrl()', () => { + it('should return the correct url', (done) => { + const url = ExecutorsNamed.constructor.getUrl(); + expect(url).to.equal('/executors-named'); + done(); + }); + }); + + describe('nextStepOptions()', () => { + it('should return the correct options', (done) => { + const ctx = {}; + const nextStepOptions = ExecutorsNamed.nextStepOptions(ctx); + expect(nextStepOptions).to.deep.equal({ + options: [ + {key: 'multiExec', value: true, choice: 'multiExec'}, + {key: 'multiExecOptionNo', value: true, choice: 'multiExecOptionNo'}, + {key: 'singleExec', value: true, choice: 'otherwise'} + ] + }); + done(); + }); + }); + + describe('createExecutorList()', () => { + it('should create a list with the main applicant as the first executor', () => { + const ctx = {}; + const formdata = { + applicant: { + 'firstName': 'Dave', + 'lastName': 'Bassett', + 'nameAsOnTheWill': 'optionYes', + 'alias': 'David James', + 'aliasReason': 'Divorce', + 'otherReason': '' + }, + executors: [] + }; + ExecutorsNamed.createExecutorList(ctx, formdata); + assert.lengthOf(ctx.list, 1); + expect(ctx.list[0]).to.deep.equal({ + firstName: 'Dave', + lastName: 'Bassett', + nameAsOnTheWill: 'optionYes', + alias: 'David James', + aliasReason: 'Divorce', + otherReason: '', + isApplying: true, + isApplicant: true, + fullName: 'Dave Bassett' + }); + }); + + it('should handle an empty executors list', () => { + const ctx = {}; + const formdata = { + applicant: { + 'firstName': 'Dave', + 'lastName': 'Bassett', + 'nameAsOnTheWill': 'optionYes', + 'alias': 'David James', + 'aliasReason': 'Divorce', + 'otherReason': '' + }, + executors: [] + }; + ExecutorsNamed.createExecutorList(ctx, formdata); + assert.lengthOf(ctx.list, 1); + }); + + it('should handle multiple executors', () => { + const ctx = {}; + const formdata = { + applicant: { + 'firstName': 'Dave', + 'lastName': 'Bassett', + 'nameAsOnTheWill': 'optionYes', + 'alias': 'David James', + 'aliasReason': 'Divorce', + 'otherReason': '' + }, + executors: { + list: [ + { + 'firstName': 'Dave', + 'lastName': 'Bassett', + 'isApplying': 'optionYes', + 'isApplicant': true + }, { + fullName: 'Ed Brown' + }, { + fullName: 'Dave Miller' + } + ] + } + }; + ExecutorsNamed.createExecutorList(ctx, formdata); + assert.lengthOf(ctx.list, 3); + expect(ctx.list[1]).to.deep.equal({ + fullName: 'Ed Brown' + }); + expect(ctx.list[2]).to.deep.equal({ + fullName: 'Dave Miller' + }); + }); + }); + describe('isComplete', () => { + it('should return inProgresswhen executorsNamed is Yes', () => { + const ctx = {executorsNamed: 'optionYes'}; + const result = ExecutorsNamed.isComplete(ctx); + expect(result).to.deep.equal([true, 'inProgress']); + }); + + it('should return inProgress when executorsNamed is No', () => { + const ctx = {executorsNamed: 'optionNo'}; + const result = ExecutorsNamed.isComplete(ctx); + expect(result).to.deep.equal([true, 'inProgress']); + }); + + it('should not return inProgress when executorsNamed is undefined', () => { + const ctx = {}; + const result = ExecutorsNamed.isComplete(ctx); + expect(result).to.deep.equal([false, 'inProgress']); + }); + }); + describe('ExecutorsNamed handlePost', () => { + let ctx; + let errors; + let formdata; + let session; + + beforeEach(() => { + ctx = { + executorsNamed: '', + list: [], + codicilPresent: false + }; + errors = []; + formdata = {}; + session = {language: 'en'}; + }); + + it('should add requiredCodicils error if executorsNamed is empty and codicilPresent is true', () => { + ctx.codicilPresent = true; + [ctx, errors] = ExecutorsNamed.handlePost(ctx, errors, formdata, session); + expect(errors).to.deep.equal([ + { + field: 'executorsNamed', + href: '#executorsNamed', + msg: content.errors.executorsNamed.requiredCodicils + } + ]); + }); + + it('should add required error if executorsNamed is empty and codicilPresent is false', () => { + [ctx, errors] = ExecutorsNamed.handlePost(ctx, errors, formdata, session); + expect(errors).to.deep.equal([ + { + field: 'executorsNamed', + href: '#executorsNamed', + msg: content.errors.executorsNamed.required + } + ]); + }); + + it('should add invalid error if list length is less than 1', () => { + ctx.executorsNamed = 'optionYes'; + [ctx, errors] = ExecutorsNamed.handlePost(ctx, errors, formdata, session); + expect(errors).to.deep.equal([ + { + field: 'executorsNamed', + href: '#executorsNamed', + msg: content.errors.executorsNamed.invalid + } + ]); + }); + + it('should add invalid error if list length is greater than 20', () => { + ctx.executorsNamed = 'optionYes'; + ctx.list = new Array(21).fill({}); + [ctx, errors] = ExecutorsNamed.handlePost(ctx, errors, formdata, session); + expect(errors).to.deep.equal([ + { + field: 'executorsNamed', + href: '#executorsNamed', + msg: content.errors.executorsNamed.invalid + } + ]); + }); + + it('should set executorName if executorsNamed is optionYes', () => { + ctx.executorsNamed = 'optionYes'; + ctx.list = [{fullName: 'Executor 1'}, {fullName: 'Executor 2'}]; + [ctx, errors] = ExecutorsNamed.handlePost(ctx, errors, formdata, session); + expect(ctx.executorName).to.deep.equal(['Executor 1', 'Executor 2']); + }); + + it('should set executorsNumber to the length of the list', () => { + ctx.executorsNamed = 'optionYes'; + ctx.list = [{fullName: 'Executor 1'}, {fullName: 'Executor 2'}]; + [ctx, errors] = ExecutorsNamed.handlePost(ctx, errors, formdata, session); + expect(ctx.executorsNumber).to.equal(2); + }); + }); +}); diff --git a/test/unit/executors/testExecutorsNumber.js b/test/unit/executors/testExecutorsNumber.js deleted file mode 100644 index b8d4e33a27..0000000000 --- a/test/unit/executors/testExecutorsNumber.js +++ /dev/null @@ -1,123 +0,0 @@ -'use strict'; -const initSteps = require('app/core/initSteps'); -const {expect, assert} = require('chai'); -const steps = initSteps([`${__dirname}/../../../app/steps/action/`, `${__dirname}/../../../app/steps/ui`]); -const ExecutorsNumber = steps.ExecutorsNumber; - -describe('ExecutorsNumber', () => { - let ctx; - let formdata; - - describe('getUrl()', () => { - it('should return the correct url', (done) => { - const url = ExecutorsNumber.constructor.getUrl(); - expect(url).to.equal('/executors-number'); - done(); - }); - }); - - describe('nextStepOptions()', () => { - it('should return the correct options', (done) => { - const ctx = {}; - const nextStepOptions = ExecutorsNumber.nextStepOptions(ctx); - expect(nextStepOptions).to.deep.equal({ - options: [{ - key: 'executorsNumber', - value: 1, - choice: 'oneExecutor' - }] - }); - done(); - }); - }); - - describe('createExecutorList', () => { - beforeEach(() => { - ctx = {}; - formdata = { - applicant: { - 'firstName': 'Dave', - 'lastName': 'Bassett', - 'nameAsOnTheWill': 'optionYes', - 'alias': 'David James', - 'aliasReason': 'Divorce', - 'otherReason': '' - }, - executors: { - list: [ - { - 'firstName': 'Dave', - 'lastName': 'Bassett', - 'isApplying': 'optionYes', - 'isApplicant': true - }, { - fullName: 'Ed Brown' - }, { - fullName: 'Dave Miller' - } - ] - } - }; - }); - - it('test only the main applicant is in the executors list when executors number is reduced', () => { - ctx.executorsNumber = 2; - ctx = ExecutorsNumber.createExecutorList(ctx, formdata); - assert.lengthOf(ctx.list, 1); - expect(ctx.list).to.deep.equal([{ - 'firstName': 'Dave', - 'lastName': 'Bassett', - 'nameAsOnTheWill': 'optionYes', - 'alias': 'David James', - 'aliasReason': 'Divorce', - 'otherReason': '', - 'isApplying': true, - 'isApplicant': true - }]); - }); - - it('test only the executors list remains the same when executors number is not reduced', () => { - ctx.executorsNumber = 3; - ctx = ExecutorsNumber.createExecutorList(ctx, formdata); - assert.lengthOf(ctx.list, 3); - expect(ctx.list).to.deep.equal([ - { - 'firstName': 'Dave', - 'lastName': 'Bassett', - 'nameAsOnTheWill': 'optionYes', - 'alias': 'David James', - 'aliasReason': 'Divorce', - 'otherReason': '', - 'isApplying': true, - 'isApplicant': true - }, { - fullName: 'Ed Brown' - }, { - fullName: 'Dave Miller' - } - ]); - }); - - it('test only the executors list remains the same when executors number is increased', () => { - ctx.executorsNumber = 5; - ctx = ExecutorsNumber.createExecutorList(ctx, formdata); - assert.lengthOf(ctx.list, 3); - expect(ctx.list).to.deep.equal([ - { - 'firstName': 'Dave', - 'lastName': 'Bassett', - 'nameAsOnTheWill': 'optionYes', - 'alias': 'David James', - 'aliasReason': 'Divorce', - 'otherReason': '', - 'isApplying': true, - 'isApplicant': true - }, { - fullName: 'Ed Brown' - }, { - fullName: 'Dave Miller' - } - ]); - }); - }); -}); diff --git a/test/util/TestWrapper.js b/test/util/TestWrapper.js index ceb022bc69..64ea927ae5 100644 --- a/test/util/TestWrapper.js +++ b/test/util/TestWrapper.js @@ -246,6 +246,7 @@ class TestWrapper { if (errorMessageValueMatch) { errorMessageValueMatch.forEach(placeholder => { const placeholderRegex = new RegExp(placeholder, 'g'); + placeholder = placeholder.replace(/[{}]/g, ''); contentToSubstitute[contentKey][type] = contentToSubstitute[contentKey][type].replace(placeholderRegex, data[placeholder]); }); }