@planning-inspectorate/dynamic-forms 3.2.0 → 3.3.1

package/src/components/text-entry-redact/question.js

@@ -60,10 +60,9 @@ export default class TextEntryRedactQuestion extends Question {
 	async getDataToSave(req, journeyResponse) {
 		if (this.useRedactedFieldNameForSave) {
 			const fieldName = this.fieldName + 'Redacted';
-			const responseToSave = { answers: {} };
-			responseToSave.answers[fieldName] = req.body[this.fieldName];
-			journeyResponse.answers[fieldName] = responseToSave.answers[fieldName];
-			return responseToSave;
+			const answers = {};
+			answers[fieldName] = req.body[this.fieldName];
+			return { answers };
 		}
 		return super.getDataToSave(req, journeyResponse);
 	}

package/src/components/unit-option-entry/question.js

@@ -127,17 +127,13 @@ export default class UnitOptionEntryQuestion extends Question {
 	}
 
 	/**
-	 * returns the data to send to the DB
-	 * side effect: modifies journeyResponse with the new answers
+	 * Get the data to save from the request, returns an object of answers
 	 * @param {import('express').Request} req
 	 * @param {JourneyResponse} journeyResponse - current journey response, modified with the new answers
 	 * @returns {Promise<{ answers: Record<string, unknown> }>}
-	 */
+	 */ //eslint-disable-next-line no-unused-vars -- journeyResponse kept for other questions to use
 	async getDataToSave(req, journeyResponse) {
-		/**
-		 * @type {{ answers: Record<string, unknown> }}
-		 */
-		let responseToSave = { answers: {} };
+		const answers = {};
 
 		/** @type {string[]} */
 		const fields = Array.isArray(req.body[this.fieldName]) ? req.body[this.fieldName] : [req.body[this.fieldName]];
@@ -150,8 +146,7 @@ export default class UnitOptionEntryQuestion extends Question {
 		if (!selectedOptions.length)
 			throw new Error(`User submitted option(s) did not correlate with valid answers to ${this.fieldName} question`);
 
-		responseToSave.answers[this.fieldName] = fieldValues.join(this.optionJoinString);
-		journeyResponse.answers[this.fieldName] = fieldValues;
+		answers[this.fieldName] = fieldValues.join(this.optionJoinString);
 
 		this.options.forEach((option) => {
 			if (!option.conditional) return;
@@ -162,13 +157,11 @@ export default class UnitOptionEntryQuestion extends Question {
 			if (optionIsSelectedOption) {
 				if (conditionalIsJustHTML(option.conditional)) return;
 				const conversionFactor = option.conditional.conversionFactor || 1;
-				const value = req.body[option.conditional.fieldName] * conversionFactor;
-				responseToSave.answers[this.conditionalFieldName] = value;
-				journeyResponse.answers[this.conditionalFieldName] = value;
+				answers[this.conditionalFieldName] = req.body[option.conditional.fieldName] * conversionFactor;
 			}
 		});
 
-		return responseToSave;
+		return { answers };
 	}
 
 	/**

package/src/components/utils/question-has-answer.js

@@ -1,7 +1,10 @@
-/** @typedef {import('../../journey/journey-response').JourneyResponse} JourneyResponse */
-/** @typedef {import('../../questions/question').Question} Question */
+/** @typedef {[any, unknown][]} QuestionKeyTuples */
+/** @typedef {(questionKeyTuples: QuestionKeyTuples) => boolean} CombinationFunc */
 
-/** @type {(response: JourneyResponse) => {and: (questionKeyTuples: [any, unknown][]) => boolean, or: (questionKeyTuples: [any, unknown][]) => boolean}} */
+/**
+ * @param {import('#src/journey/journey-response.js').JourneyResponse} response
+ * @returns {{and: CombinationFunc, or: CombinationFunc}}
+ */
 export const logicalCombinations = (response) => ({
 	and: (questionKeyTuples) =>
 		questionKeyTuples.every((questionKeyTuple) => questionHasAnswer(response, ...questionKeyTuple)),
@@ -9,8 +12,28 @@ export const logicalCombinations = (response) => ({
 		questionKeyTuples.some((questionKeyTuple) => questionHasAnswer(response, ...questionKeyTuple))
 });
 
-// TODO Make a type for all the question classes and use it here
-/** @type {(response: JourneyResponse, question: any, expectedValue: unknown) => boolean} */
+/**
+ * A wrapper around questionHasAnswer to use as a condition directly
+ *
+ * @example
+ * .withCondition(whenQuestionHasAnswer(question.q1, 'answer-1'))
+ *
+ * @param {import('#question').Question} question
+ * @param {unknown} expectedValue
+ * @returns {import('#src/section.js').QuestionCondition}
+ */
+export const whenQuestionHasAnswer = (question, expectedValue) => {
+	return (response) => questionHasAnswer(response, question, expectedValue);
+};
+
+/**
+ * Does the question have the expected answer?
+ *
+ * @param {import('#src/journey/journey-response.js').JourneyResponse} response
+ * @param {import('#question').Question|{optionJoinString: string}} question
+ * @param {unknown} expectedValue
+ * @returns {boolean}
+ */
 export const questionHasAnswer = (response, question, expectedValue) => {
 	if (!response.answers) return false;
 	const answerField = response.answers[question.fieldName];
@@ -46,8 +69,13 @@ export const questionArrayMeetsCondition = (response, question, conditionFn = ()
 	return false;
 };
 
-// TODO Make a type for all the question classes and use it here
-/** @type {(response: JourneyResponse, questionKeyTuples: [any, unknown][], options?: {logicalCombinator: 'and' | 'or'}) => boolean} */
+/**
+ * @param {import('#src/journey/journey-response.js').JourneyResponse} response
+ * @param {QuestionKeyTuples} questionKeyTuples
+ * @param {Object} [options]
+ * @param {'and' | 'or'} options.logicalCombinator
+ * @returns {boolean}
+ */
 export const questionsHaveAnswers = (
 	response,
 	questionKeyTuples,
@@ -58,16 +86,22 @@ export const questionsHaveAnswers = (
 	return combinators[logicalCombinator](questionKeyTuples);
 };
 
-// TODO Make a type for all the question classes and use it here
-/** @type {(response: JourneyResponse, question: any) => boolean} */
+/**
+ * @param {import('#src/journey/journey-response.js').JourneyResponse} response
+ * @param {import('#question').Question} question
+ * @returns {boolean}
+ */
 export const questionHasNonEmptyStringAnswer = (response, question) => {
 	if (!response.answers) return false;
 	const answerField = response.answers[question.fieldName];
 	return typeof answerField === 'string' && answerField.trim().length > 0;
 };
 
-// TODO Make a type for all the question classes and use it here
-/** @type {(response: JourneyResponse, question: any) => boolean} */
+/**
+ * @param {import('#src/journey/journey-response.js').JourneyResponse} response
+ * @param {import('#question').Question} question
+ * @returns {boolean}
+ */
 export const questionHasNonEmptyNumberAnswer = (response, question) => {
 	if (!response.answers) return false;
 	const answerField = response.answers[question.fieldName];

package/src/components/utils/question-utils.js

@@ -1,7 +1,3 @@
-/**
- * @typedef {import('../../journey/journey-response').JourneyResponse} JourneyResponse
- */
-
 export function getConditionalFieldName(parentField, conditionalField) {
 	return `${parentField}_${conditionalField}`;
 }
@@ -12,44 +8,14 @@ export function getConditionalAnswer(answers, question, answer) {
 }
 
 /**
- * @param {JourneyResponse} journeyResponse
- * @param {string} fieldName
- */
-export function getAddressesForQuestion(journeyResponse, fieldName) {
-	const addresses = journeyResponse.answers?.SubmissionAddress || [];
-
-	return addresses.filter((address) => address.fieldName === fieldName);
-}
-
-/**
- * @param {JourneyResponse} journeyResponse
- * @param {string} fieldName
+ * @param {unknown} conditional
+ * @returns {conditional is {html: string}}
  */
-export function getLinkedCasesForQuestion(journeyResponse, fieldName) {
-	const linkedCases = journeyResponse.answers?.SubmissionLinkedCase || [];
-
-	return linkedCases.filter((linkedCase) => linkedCase.fieldName === fieldName);
-}
-
-/**
- * @param {JourneyResponse} journeyResponse
- * @param {string} fieldName
- */
-export function getListedBuildingForQuestion(journeyResponse, fieldName) {
-	const listedBuildings = journeyResponse.answers?.SubmissionListedBuilding || [];
-
-	return listedBuildings.filter((listedBuilding) => listedBuilding.fieldName === fieldName);
-}
-
-/** @type {(conditional: unknown) => conditional is { html: string }} */
 export function conditionalIsJustHTML(conditional) {
 	return !!conditional && Object.hasOwn(conditional, 'html') && Object.keys(conditional).length === 1;
 }
 
 export default {
-	getAddressesForQuestion,
 	getConditionalAnswer,
-	getConditionalFieldName,
-	getListedBuildingForQuestion,
-	getLinkedCasesForQuestion
+	getConditionalFieldName
 };

package/src/controller.js

@@ -1,5 +1,6 @@
 import { SECTION_STATUS } from './section.js';
 import questionUtils from './components/utils/question-utils.js';
+import { answerObjectForManageListSaving } from '#src/components/manage-list/utils.js';
 
 /**
  * @typedef {import('./journey/journey.js').Journey} Journey
@@ -249,6 +250,16 @@ export function buildSave(saveData, redirectToTaskListOnSuccess) {
 			if (redirectToTaskListOnSuccess) {
 				return res.redirect(journey.taskListUrl);
 			}
+			// edit the journey.response which question.shouldDisplay uses
+			// we need to ensure the latest answer just submitted is included
+			// as question.shouldDisplay checks the response and is used to determine the next question
+			let answers = journeyResponse.answers;
+			if (question.isInManageListSection) {
+				answers = answerObjectForManageListSaving(journeyResponse, manageListQuestion, req.params);
+			}
+			for (const [k, v] of Object.entries(data?.answers || {})) {
+				answers[k] = v;
+			}
 			// move to the next question
 			return journey.redirectToNextQuestion(res, req.params, manageListQuestion);
 		} catch (err) {

package/src/controller.test.js

@@ -379,6 +379,7 @@ describe('dynamic-form/controller', () => {
 			const saveData = mock.fn();
 			await buildSave(saveData)(req, res, journeyId);
 
+			assert.strictEqual(sampleQuestionObj.getDataToSave.mock.callCount(), 1);
 			assert.strictEqual(saveData.mock.callCount(), 1);
 			assert.deepStrictEqual(saveData.mock.calls[0].arguments, [
 				{
@@ -499,6 +500,9 @@ describe('dynamic-form/controller', () => {
 			const sampleQuestionObjWithActions = {
 				...sampleQuestionObj
 			};
+			sampleQuestionObjWithActions.getDataToSave.mock.mockImplementationOnce(() => ({
+				answers: { [sampleQuestionObj.fieldName]: 'my-answer' }
+			}));
 
 			req.params = {
 				referenceId: mockRef,
@@ -522,6 +526,8 @@ describe('dynamic-form/controller', () => {
 			assert.strictEqual(saveData.mock.callCount(), 1);
 			assert.strictEqual(res.redirect.mock.callCount(), 1);
 			assert.strictEqual(res.redirect.mock.calls[0].arguments[0], expectedUrl);
+			// journey response should be edited if redirecting to next question
+			assert.strictEqual(res.locals.journeyResponse.answers?.sampleFieldName, 'my-answer');
 		});
 
 		it('should redirect to task list if configured', async () => {
@@ -531,6 +537,9 @@ describe('dynamic-form/controller', () => {
 			const sampleQuestionObjWithActions = {
 				...sampleQuestionObj
 			};
+			sampleQuestionObjWithActions.getDataToSave.mock.mockImplementationOnce(() => ({
+				answers: { [sampleQuestionObj.fieldName]: 'my-answer' }
+			}));
 
 			req.params = {
 				referenceId: mockRef,
@@ -555,6 +564,8 @@ describe('dynamic-form/controller', () => {
 			assert.strictEqual(res.redirect.mock.callCount(), 1);
 			assert.match(res.redirect.mock.calls[0].arguments[0], /\/task-list$/);
 			assert.strictEqual(mockJourney.getNextQuestionUrl.mock.callCount(), 0);
+			// journey response should not be edited if redirecting to task list
+			assert.strictEqual(Object.keys(res.locals.journeyResponse.answers).length, 0);
 		});
 
 		describe('manageListQuestions', () => {
@@ -585,7 +596,8 @@ describe('dynamic-form/controller', () => {
 				const journey = {
 					getSection: mock.fn(() => ({ segment: 'section-1' })),
 					getQuestionByParams: mock.fn(),
-					redirectToNextQuestion: mock.fn()
+					redirectToNextQuestion: mock.fn(),
+					response: { answers: {} }
 				};
 				const res = {
 					locals: {

package/src/journey/journey.js

@@ -269,6 +269,7 @@ export class Journey {
 					response: this.response,
 					manageListQuestion,
 					takeNextQuestion,
+					routeParams: params,
 					reverse
 				});
 				if (question === END_OF_SECTION) {

package/src/lib/utils.js

@@ -17,3 +17,14 @@ export function capitalize(str) {
 	if (typeof str !== 'string') return '';
 	return str.charAt(0).toUpperCase() + str.slice(1);
 }
+
+/**
+ * Trim a trailing slash if present
+ *
+ * @param {string} [str]
+ * @returns {string}
+ */
+export function trimTrailingSlash(str) {
+	if (typeof str !== 'string') return str;
+	return str.replace(/\/$/, '');
+}

package/src/lib/utils.test.js

@@ -0,0 +1,19 @@
+import { describe, it } from 'node:test';
+import assert from 'node:assert';
+import { trimTrailingSlash } from '#src/lib/utils.js';
+
+describe('utils', () => {
+	describe('trimTrailingSlash', () => {
+		it('should trim a trailing slash', () => {
+			assert.strictEqual(trimTrailingSlash('my-url.com/hello/'), 'my-url.com/hello');
+		});
+		it('should do nothing if no trailing slash', () => {
+			assert.strictEqual(trimTrailingSlash('my-url.com/hello'), 'my-url.com/hello');
+		});
+		it('should return non-string types', () => {
+			assert.strictEqual(trimTrailingSlash(null), null);
+			assert.strictEqual(trimTrailingSlash(undefined), undefined);
+			assert.strictEqual(trimTrailingSlash(5), 5);
+		});
+	});
+});

package/src/lib/uuid.test.js

@@ -2,18 +2,6 @@ import { Uuid } from '#src/lib/uuid.js';
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
 
-/**
- *
- * @param {import('node:test').TestContext} ctx
- * @param {string} [uuid]
- */
-export function mockRandomUUID(ctx, uuid = '00000000-0000-0000-0000-000000000000') {
-	const original = Uuid.randomUUID;
-	Uuid.randomUUID = ctx.mock.fn(() => uuid);
-	// restore after the tests
-	ctx.after(() => (Uuid.randomUUID = original));
-}
-
 describe('uuid', () => {
 	it('should return a valid v4 UUID', () => {
 		assert.match(

package/src/questions/options-question.js

@@ -120,17 +120,13 @@ export default class OptionsQuestion extends Question {
 	}
 
 	/**
-	 * returns the data to send to the DB
-	 * side effect: modifies journeyResponse with the new answers
+	 * Get the data to save from the request, returns an object of answers
 	 * @param {import('express').Request} req
 	 * @param {JourneyResponse} journeyResponse - current journey response, modified with the new answers
 	 * @returns {Promise<{ answers: Record<string, unknown> }>}
-	 */
+	 */ //eslint-disable-next-line no-unused-vars -- journeyResponse kept for other questions to use
 	async getDataToSave(req, journeyResponse) {
-		/**
-		 * @type {{ answers: Record<string, unknown> }}
-		 */
-		let responseToSave = { answers: {} };
+		const answers = {};
 
 		const fields = Array.isArray(req.body[this.fieldName]) ? req.body[this.fieldName] : [req.body[this.fieldName]];
 		const fieldValues = fields.map((x) => x.trim());
@@ -142,8 +138,7 @@ export default class OptionsQuestion extends Question {
 		if (!selectedOptions.length)
 			throw new Error(`User submitted option(s) did not correlate with valid answers to ${this.fieldName} question`);
 
-		responseToSave.answers[this.fieldName] = fieldValues.join(this.optionJoinString);
-		journeyResponse.answers[this.fieldName] = fieldValues;
+		answers[this.fieldName] = fieldValues.join(this.optionJoinString);
 
 		this.options.forEach((option) => {
 			if (!option.conditional) return;
@@ -152,11 +147,9 @@ export default class OptionsQuestion extends Question {
 				(selectedOption) => option.text === selectedOption.text && option.value === selectedOption.value
 			);
 
-			const value = optionIsSelectedOption ? req.body[key]?.trim() : null;
-			responseToSave.answers[key] = value;
-			journeyResponse.answers[key] = value;
+			answers[key] = optionIsSelectedOption ? req.body[key]?.trim() : null;
 		});
 
-		return responseToSave;
+		return { answers };
 	}
 }

package/src/questions/question.js

@@ -1,9 +1,9 @@
 import escape from 'escape-html';
 import RequiredValidator from '../validator/required-validator.js';
-import RequiredFileUploadValidator from '../validator/required-file-upload-validator.js';
-import { capitalize, nl2br } from '../lib/utils.js';
+import { capitalize, nl2br, trimTrailingSlash } from '../lib/utils.js';
 import AddressValidator from '../validator/address-validator.js';
 import MultiFieldInputValidator from '../validator/multi-field-input-validator.js';
+import { answerObjectForManageList } from '#src/components/manage-list/utils.js';
 
 /**
  * @typedef {import('../validator/base-validator.js')} BaseValidator
@@ -33,6 +33,8 @@ import MultiFieldInputValidator from '../validator/multi-field-input-validator.j
  * @property {string} backLink
  * @property {boolean} showBackToListLink
  * @property {string} listLink
+ * @property {Object} util
+ * @property {function(string): string} util.trimTrailingSlash
  */
 
 /**
@@ -239,6 +241,10 @@ export class Question {
 
 			continueButtonText: this.continueButtonText,
 
+			util: {
+				trimTrailingSlash
+			},
+
 			...customViewData,
 			...this.viewData
 		};
@@ -284,12 +290,7 @@ export class Question {
 				throw new Error('no manageListQuestion for manage list question');
 			}
 			// if this is a manage list question, the response is within the 'parent' manage list answers array
-			const answers = response.answers[manageListQuestion.fieldName];
-			if (!Array.isArray(answers)) {
-				return {};
-			}
-			const itemId = params.manageListItemId;
-			return answers.find((a) => a.id === itemId) || {};
+			return answerObjectForManageList(response, manageListQuestion, params.manageListItemId);
 		}
 		return response.answers;
 	}
@@ -337,38 +338,24 @@ export class Question {
 	}
 
 	/**
-	 * returns the data to send to the DB
-	 * side effect: modifies journeyResponse with the new answers
+	 * Get the data to save from the request, returns an object of answers
+	 *
 	 * @param {import('express').Request} req
-	 * @param {JourneyResponse} journeyResponse - current journey response, modified with the new answers
+	 * @param {JourneyResponse} journeyResponse - current journey response
 	 * @returns {Promise<{ answers: Record<string, unknown> }>}
-	 */
+	 */ //eslint-disable-next-line no-unused-vars -- journeyResponse kept for other questions to use
 	async getDataToSave(req, journeyResponse) {
-		/**
-		 * @type {{ answers: Record<string, unknown> }}
-		 */
-		let responseToSave = { answers: {} };
+		const answers = {};
 
-		responseToSave.answers[this.fieldName] = req.body[this.fieldName];
+		answers[this.fieldName] = req.body[this.fieldName];
 
 		for (const propName in req.body) {
 			if (propName.startsWith(this.fieldName + '_')) {
-				responseToSave.answers[propName] = req.body[propName];
-				journeyResponse.answers[propName] = req.body[propName];
+				answers[propName] = req.body[propName];
 			}
-			// todo: sort this
-			// } else if (numericFields.has(propName)) {
-			// 	const numericValue = Number(req.body[propName]);
-			// 	if (!isNaN(numericValue)) {
-			// 		responseToSave.answers[propName] = numericValue;
-			// 		journeyResponse.answers[propName] = numericValue;
-			// 	}
-			// }
 		}
 
-		journeyResponse.answers[this.fieldName] = responseToSave.answers[this.fieldName];
-
-		return responseToSave;
+		return { answers };
 	}
 
 	/**
@@ -470,7 +457,6 @@ export class Question {
 		return this.validators?.some(
 			(item) =>
 				item instanceof RequiredValidator ||
-				item instanceof RequiredFileUploadValidator ||
 				(item instanceof AddressValidator && item.isRequired()) ||
 				(item instanceof MultiFieldInputValidator && item.isRequired())
 		);

package/src/questions/question.test.js

@@ -179,6 +179,8 @@ describe('./src/dynamic-forms/question.js', () => {
 			assert.deepStrictEqual(result.listLink, journey.taskListUrl);
 			assert.deepStrictEqual(result.journeyTitle, journey.journeyTitle);
 			assert.deepStrictEqual(result.hello, 'hi');
+			assert.ok(result.util);
+			assert.ok(typeof result.util.trimTrailingSlash === 'function');
 		});
 		it('should include viewData in viewModel', () => {
 			const question = getTestQuestion({ viewData: { test: 'data' } });
@@ -323,7 +325,7 @@ describe('./src/dynamic-forms/question.js', () => {
 	});
 
 	describe('getDataToSave', () => {
-		it('should return answer from req.body and modify journeyResponse', async () => {
+		it('should return answer from req.body', async () => {
 			const question = getTestQuestion();
 
 			const req = {
@@ -331,14 +333,8 @@ describe('./src/dynamic-forms/question.js', () => {
 					[question.fieldName]: { a: 1 }
 				}
 			};
-			const journeyResponse = {
-				answers: {
-					[question.fieldName]: { b: 1 },
-					other: 'another-answer'
-				}
-			};
 
-			const result = await question.getDataToSave(req, journeyResponse);
+			const result = await question.getDataToSave(req);
 
 			const expectedResult = {
 				answers: {
@@ -346,8 +342,6 @@ describe('./src/dynamic-forms/question.js', () => {
 				}
 			};
 			assert.deepStrictEqual(result, expectedResult);
-			expectedResult.answers.other = 'another-answer';
-			assert.deepStrictEqual(journeyResponse, expectedResult);
 		});
 
 		it('should handle nested properties', async () => {
@@ -360,14 +354,8 @@ describe('./src/dynamic-forms/question.js', () => {
 					[question.fieldName + '_2']: { a: 3 }
 				}
 			};
-			const journeyResponse = {
-				answers: {
-					[question.fieldName]: { b: 1 },
-					other: 'another-answer'
-				}
-			};
 
-			const result = await question.getDataToSave(req, journeyResponse);
+			const result = await question.getDataToSave(req);
 
 			const expectedResult = {
 				answers: {
@@ -377,8 +365,6 @@ describe('./src/dynamic-forms/question.js', () => {
 				}
 			};
 			assert.deepStrictEqual(result, expectedResult);
-			expectedResult.answers.other = 'another-answer';
-			assert.deepStrictEqual(journeyResponse, expectedResult);
 		});
 	});
 

package/src/section-types.d.ts

@@ -1,6 +1,7 @@
 import { JourneyResponse } from '#src/journey/journey-response.js';
 import ManageListQuestion from '#src/components/manage-list/question.js';
 import { Question } from '#src/questions/question.js';
+import { RouteParams } from '#src/journey/journey-types.d.ts';
 
 export interface GetNextQuestionParams {
 	questionFieldName: string;
@@ -8,6 +9,7 @@ export interface GetNextQuestionParams {
 	// if this is part of a manage list section
 	manageListQuestion?: ManageListQuestion;
 	takeNextQuestion: boolean;
+	routeParams: RouteParams;
 	// to get previous question instead of next
 	reverse: boolean;
 }

package/src/section.js

@@ -5,6 +5,7 @@
  */
 
 import RequiredValidator from './validator/required-validator.js';
+import { answerObjectForManageList } from '#src/components/manage-list/utils.js';
 
 /**
  * A value indicating the final question of a section has been reached
@@ -203,11 +204,14 @@ export class Section {
 	 * @returns {Question|Symbol|null}
 	 */
 	getNextQuestion(params) {
-		const { manageListQuestion } = params;
+		const { response, manageListQuestion, routeParams } = params;
 		if (manageListQuestion) {
 			// first check if the next question is within the manage list section
+			// here we get the answers for the manage list item for the question.shouldDisplay logic
+			const answers = answerObjectForManageList(response, manageListQuestion, routeParams.manageListItemId);
 			const next = Section.getNextQuestion({
 				...params,
+				response: { answers },
 				questions: manageListQuestion.section.questions
 			});
 			if (next === END_OF_SECTION) {

package/src/section.test.js

@@ -715,12 +715,14 @@ describe('./src/dynamic-forms/section.js', () => {
 				const section = new Section('s1', 'S').addQuestion(q1).addQuestion(manageListQ, manageListSection);
 				return { section, q1, manageListQ, q3, q4 };
 			};
+			const response = { answers: {} };
 			it(`should get first question within a manage list section`, () => {
 				const { section, manageListQ, q3 } = newSectionWithManageList();
 				const next = section.getNextQuestion({
 					questionFieldName: manageListQ.fieldName,
-					response: {},
+					response,
 					manageListQuestion: manageListQ,
+					routeParams: {},
 					takeNextQuestion: true,
 					reverse: false
 				});
@@ -730,8 +732,9 @@ describe('./src/dynamic-forms/section.js', () => {
 				const { section, manageListQ, q3, q4 } = newSectionWithManageList();
 				const next = section.getNextQuestion({
 					questionFieldName: q3.fieldName,
-					response: {},
+					response,
 					manageListQuestion: manageListQ,
+					routeParams: {},
 					takeNextQuestion: false,
 					reverse: false
 				});
@@ -741,8 +744,9 @@ describe('./src/dynamic-forms/section.js', () => {
 				const { section, manageListQ, q4 } = newSectionWithManageList();
 				const next = section.getNextQuestion({
 					questionFieldName: q4.fieldName,
-					response: {},
+					response,
 					manageListQuestion: manageListQ,
+					routeParams: {},
 					takeNextQuestion: false,
 					reverse: false
 				});

package/test/check-your-answers.test.js

@@ -3,7 +3,7 @@ import assert from 'assert';
 import { manageListQuestions, questionsInOrder } from './questions.js';
 import path from 'path';
 import { escapeForRegExp, snapshotsDir } from './utils/utils.js';
-import { createAppWithQuestions, mockAnswer, mockAnswerBody } from './questions.test.js';
+import { createAppWithQuestions, mockAnswer, mockAnswerBody } from './utils/question-test-utils.js';
 import { COMPONENT_TYPES } from '#src/index.js';
 
 describe('check-your-answers', () => {

package/test/mock/uuid.js

@@ -0,0 +1,13 @@
+import { Uuid } from '#src/lib/uuid.js';
+
+/**
+ *
+ * @param {import('node:test').TestContext} ctx
+ * @param {string} [uuid]
+ */
+export function mockRandomUUID(ctx, uuid = '00000000-0000-0000-0000-000000000000') {
+	const original = Uuid.randomUUID;
+	Uuid.randomUUID = ctx.mock.fn(() => uuid);
+	// restore after the tests
+	ctx.after(() => (Uuid.randomUUID = original));
+}