@planning-inspectorate/dynamic-forms 3.3.3 → 3.4.0

package/src/index.js

@@ -1,25 +1,72 @@
-/**
- * @typedef {import('./questions/question-props.js').QuestionTypes} QuestionTypes
- */
-
-/**
- * @type {Readonly<{CHECKBOX: QuestionTypes, BOOLEAN: QuestionTypes, RADIO: QuestionTypes, DATE: QuestionTypes, DATE_PERIOD: QuestionTypes, TEXT_ENTRY: QuestionTypes, TEXT_ENTRY_REDACT: QuestionTypes, SELECT: QuestionTypes, SINGLE_LINE_INPUT: QuestionTypes, MULTI_FIELD_INPUT: QuestionTypes, NUMBER: QuestionTypes, ADDRESS: QuestionTypes, UNIT_OPTION: QuestionTypes, EMAIL: QuestionTypes, MANAGE_LIST: QuestionTypes}>}
- */
-export const COMPONENT_TYPES = Object.freeze({
-	CHECKBOX: 'checkbox',
-	BOOLEAN: 'boolean',
-	RADIO: 'radio',
-	DATE: 'date',
-	DATE_PERIOD: 'date-period',
-	DATE_TIME: 'date-time',
-	TEXT_ENTRY: 'text-entry',
-	TEXT_ENTRY_REDACT: 'text-entry-redact',
-	SELECT: 'select',
-	SINGLE_LINE_INPUT: 'single-line-input',
-	MULTI_FIELD_INPUT: 'multi-field-input',
-	NUMBER: 'number',
-	ADDRESS: 'site-address',
-	UNIT_OPTION: 'unit-option',
-	EMAIL: 'email',
-	MANAGE_LIST: 'manage-list'
-});
+// Components
+import AddressQuestion from './components/address/question.js';
+import DateValidator from './validator/date-validator.js';
+import EmailValidator from './validator/email-validator.js';
+import StringValidator from './validator/string-validator.js';
+
+export { AddressQuestion };
+export * from './components/boolean/question.js';
+export * from './components/checkbox/question.js';
+export * from './components/date/question.js';
+export * from './components/date-period/question.js';
+export * from './components/multi-field-input/question.js';
+export * from './components/number-entry/question.js';
+export * from './components/radio/question.js';
+export * from './components/select/question.js';
+export * from './components/single-line-input/question.js';
+export * from './components/text-entry/question.js';
+export * from './components/text-entry-redact/question.js';
+export * from './components/unit-option-entry/question.js';
+export * from './components/utils/persisted-number-answer.js';
+export * from './components/utils/question-has-answer.js';
+export * from './components/utils/question-utils.js';
+export * from './components/utils/component-types.js';
+
+// Controller
+export * from './controller.js';
+
+// Journey
+export { Journey } from './journey/journey.js';
+export { JourneyResponse } from './journey/journey-response.js';
+
+// lib
+export * from './lib/address.js';
+export * from './lib/address-utils.js';
+export * from './lib/date-utils.js';
+export * from './lib/session-answer-store.js';
+export * from './lib/utils.js';
+
+// middleware
+export * from './middleware/build-get-journey.js';
+export * from './middleware/redirect-to-unanswered-question.js';
+
+// Questions
+export { Question } from './questions/question.js';
+export { createQuestions } from './questions/create-questions.js';
+export * from './questions/options-question.js';
+export { questionClasses } from './questions/questions.js';
+
+// Section
+export { Section } from './section.js';
+
+// validators
+export * from './validator/address-validator.js';
+export * from './validator/base-validator.js';
+export * from './validator/conditional-required-validator.js';
+export * from './validator/confirmation-checkbox-validator.js';
+export * from './validator/coordinates-validator.js';
+export * from './validator/date-period-validator.js';
+export * from './validator/date-time-validator.js';
+export { DateValidator };
+export { EmailValidator };
+export * from './validator/document-upload-validator.js';
+export * from './validator/multi-field-input-validator.js';
+export * from './validator/numeric-validator.js';
+export { default as RequiredValidator } from './validator/required-validator.js';
+export * from './validator/same-answer-validator.js';
+export { StringValidator };
+export * from './validator/unit-option-entry-validator.js';
+export * from './validator/valid-option-validator.js';
+export * from './validator/validation-error-handler.js';
+export { default as validate } from './validator/validator.js';
+export * from './validator/validator.js';

package/src/middleware/redirect-to-unanswered-question.test.js

@@ -5,7 +5,7 @@ import { redirectToUnansweredQuestion } from './redirect-to-unanswered-question.
 import { JourneyResponse } from '../journey/journey-response.js';
 import { Journey } from '../journey/journey.js';
 import { Section } from '../section.js';
-import { COMPONENT_TYPES } from '../index.js';
+import { COMPONENT_TYPES } from '../components/utils/component-types.js';
 import { questionHasAnswer } from '../components/utils/question-has-answer.js';
 
 describe('redirectToUnansweredQuestion Middleware', () => {

package/src/questions/options-question.js

@@ -5,13 +5,6 @@ import { getConditionalFieldName } from '../components/utils/question-utils.js';
 
 const defaultOptionJoinString = ',';
 
-/**
- * @typedef {import('./question').QuestionViewModel} QuestionViewModel
- * @typedef {import('../journey/journey.js').Journey} Journey
- * @typedef {import('../journey/journey-response.js').JourneyResponse} JourneyResponse
- * @typedef {import('../section.js').Section} Section
- */
-
 /**
  * @typedef {{
  *   text: string;
@@ -37,7 +30,7 @@ const defaultOptionJoinString = ',';
  */
 
 /**
- * @typedef {QuestionViewModel & { question: { options: Option[] } }} OptionsViewModel
+ * @typedef {import('./question').QuestionViewModel & { question: { options: Option[] } }} OptionsViewModel
  */
 
 export default class OptionsQuestion extends Question {
@@ -65,12 +58,12 @@ export default class OptionsQuestion extends Question {
 
 	/**
 	 * gets the view model for this question
-	 * @param {Section} section - the current section
-	 * @param {Journey} journey - the journey we are in
+	 * @param {import('#section').Section} section - the current section
+	 * @param {import('#journey').Journey} journey - the journey we are in
 	 * @param {Record<string, unknown>} [customViewData] additional data to send to view
 	 * @param {Record<string, unknown>} [payload]
 	 * @param {import('#src/questions/question-types.d.ts').PrepQuestionForRenderingOptions} options
-	 * @returns {QuestionViewModel}
+	 * @returns {import('./question').QuestionViewModel} QuestionViewModel
 	 */
 	prepQuestionForRendering(section, journey, customViewData, payload, options) {
 		const viewModel = super.prepQuestionForRendering(section, journey, customViewData, payload, options);
@@ -125,7 +118,7 @@ export default class OptionsQuestion extends Question {
 	/**
 	 * 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 {import('../journey/journey-response.js').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) {

package/src/questions/question-types.d.ts

@@ -1,7 +1,7 @@
-import BaseValidator from '../validator/base-validator';
-import { JourneyResponse } from '../journey/journey-response';
 import { RouteParams } from '#src/journey/journey-types.d.ts';
 import ManageListQuestion from '#src/components/manage-list/question.js';
+import BaseValidator from '../validator/base-validator.js';
+import { JourneyResponse } from '../journey/journey-response.js';
 
 export interface QuestionParameters {
 	title: string;
@@ -22,7 +22,7 @@ export interface QuestionParameters {
 	// override the action link for this question
 	actionLink?: ActionLink;
 	// static view data for this question
-	viewData?: Object<string, any>;
+	viewData?: Record<string, any>;
 }
 
 export interface ActionLink {

package/src/questions/question.js

@@ -6,12 +6,12 @@ import MultiFieldInputValidator from '../validator/multi-field-input-validator.j
 import { answerObjectForManageList } from '#src/components/manage-list/utils.js';
 
 /**
- * @typedef {import('../validator/base-validator.js')} BaseValidator
- * @typedef {import('../journey/journey.js').Journey} Journey
- * @typedef {import('../journey/journey-response.js').JourneyResponse} JourneyResponse
- * @typedef {import('../section.js').Section} Section
- * @typedef {import('../controller.js').ActionView} ActionView
- * @typedef {import('./question-types.js').ActionLink} ActionLink
+ * @import {BaseValidator} from "#base-validator"
+ * @import {Journey} from "#journey"
+ * @import {JourneyResponse} from "#journey-response"
+ * @import {Section} from "#section"
+ * @import {ActionView} from "../controller.js"
+ * @import {ActionLink} from "./question-types.js"
  */
 
 /**

package/src/questions/questions.js

@@ -12,7 +12,7 @@ import NumberEntryQuestion from '../components/number-entry/question.js';
 import UnitOptionEntryQuestion from '../components/unit-option-entry/question.js';
 import EmailQuestion from '../components/email/question.js';
 
-import { COMPONENT_TYPES } from '../index.js';
+import { COMPONENT_TYPES } from '../components/utils/component-types.js';
 import TextEntryRedactQuestion from '../components/text-entry-redact/question.js';
 import DateTimeQuestion from '../components/date-time/question.js';
 import ManageListQuestion from '../components/manage-list/question.js';

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

@@ -1,8 +1,7 @@
 import { describe, it } from 'node:test';
 import assert from 'assert';
 import { manageListQuestions, questionsInOrder } from './questions.js';
-import path from 'path';
-import { escapeForRegExp, snapshotsDir } from './utils/utils.js';
+import { assertSnapshot, escapeForRegExp } from './utils/utils.js';
 import { createAppWithQuestions, mockAnswer, mockAnswerBody } from './utils/question-test-utils.js';
 import { COMPONENT_TYPES } from '#src/index.js';
 
@@ -30,9 +29,7 @@ describe('check-your-answers', () => {
 				new RegExp(`<a[^>]* href="questions/${q.url}">\\s*Answer\\s*<span[^>]*>\\s*${escapedQ}\\s*</span></a>`, 'i')
 			);
 		}
-		ctx.assert.fileSnapshot(text, path.join(snapshotsDir(), 'check-your-answers-not-started.html'), {
-			serializers: [(v) => v]
-		});
+		assertSnapshot(ctx, text, 'check-your-answers-not-started.html');
 	});
 
 	it(`should render all question answers`, async (ctx) => {
@@ -80,8 +77,6 @@ describe('check-your-answers', () => {
 				new RegExp(`<a[^>]* href="questions/${q.url}">\\s*Change\\s*<span[^>]*>\\s*${escapedQ}\\s*</span></a>`, 'i')
 			);
 		}
-		ctx.assert.fileSnapshot(text, path.join(snapshotsDir(), 'check-your-answers-with-answers.html'), {
-			serializers: [(v) => v]
-		});
+		assertSnapshot(ctx, text, 'check-your-answers-with-answers.html');
 	});
 });

package/test/conditional-journey.test.js

@@ -0,0 +1,431 @@
+import { describe, it } from 'node:test';
+import assert from 'assert';
+import { Section } from '#src/section.js';
+import { Journey } from '#src/journey/journey.js';
+import { COMPONENT_TYPES } from '#src/index.js';
+import { createQuestions } from '#src/questions/create-questions.js';
+import { questionClasses } from '#src/questions/questions.js';
+import { whenQuestionHasAnswer } from '#src/components/utils/question-has-answer.js';
+import { BOOLEAN_OPTIONS } from '#src/components/boolean/question.js';
+import { createAppWithQuestions, renderQuestionCheck, postAnswer } from '#test/utils/question-test-utils.js';
+
+const JOURNEY_ID = 'conditional-journey';
+
+/**
+ * Question props for conditional journey tests
+ * @type {Record<string, import('#src/questions/question-props.js').QuestionProps>}
+ */
+const conditionalQuestionProps = {
+	// Section 1: Insurance (simple + chained conditions)
+	wantsInsurance: {
+		type: COMPONENT_TYPES.BOOLEAN,
+		title: 'Want Insurance',
+		question: 'Do you want to add travel insurance?',
+		fieldName: 'wantsInsurance',
+		url: 'wants-insurance',
+		label: 'Add insurance?'
+	},
+	insuranceLevel: {
+		type: COMPONENT_TYPES.RADIO,
+		title: 'Insurance Level',
+		question: 'What level of insurance do you want?',
+		fieldName: 'insuranceLevel',
+		url: 'insurance-level',
+		label: 'Select an insurance level',
+		options: [
+			{ value: 'basic', text: 'Basic' },
+			{ value: 'premium', text: 'Premium' }
+		]
+	},
+	premiumBenefits: {
+		type: COMPONENT_TYPES.CHECKBOX,
+		title: 'Premium Benefits',
+		question: 'Which premium benefits do you want?',
+		fieldName: 'premiumBenefits',
+		url: 'premium-benefits',
+		label: 'Select all that apply',
+		options: [
+			{ value: 'cancellation', text: 'Cancellation cover' },
+			{ value: 'medical', text: 'Medical cover' },
+			{ value: 'luggage', text: 'Luggage cover' }
+		]
+	},
+	// Section 2: Trip (leads to section condition)
+	tripType: {
+		type: COMPONENT_TYPES.RADIO,
+		title: 'Trip Type',
+		question: 'What type of trip are you planning?',
+		fieldName: 'tripType',
+		url: 'trip-type',
+		label: 'Select a trip type',
+		options: [
+			{ value: 'domestic', text: 'Domestic' },
+			{ value: 'international', text: 'International' }
+		]
+	},
+	// Section 3: Visa (section-wide condition based on tripType)
+	visaRequired: {
+		type: COMPONENT_TYPES.BOOLEAN,
+		title: 'Visa Required',
+		question: 'Do you need a visa for your destination?',
+		fieldName: 'visaRequired',
+		url: 'visa-required',
+		label: 'Visa required?'
+	},
+	visaType: {
+		type: COMPONENT_TYPES.RADIO,
+		title: 'Visa Type',
+		question: 'What type of visa do you need?',
+		fieldName: 'visaType',
+		url: 'visa-type',
+		label: 'Select a visa type',
+		options: [
+			{ value: 'tourist', text: 'Tourist' },
+			{ value: 'business', text: 'Business' }
+		]
+	},
+	// Section 4: Accommodation (multi-question condition)
+	accommodation: {
+		type: COMPONENT_TYPES.RADIO,
+		title: 'Accommodation',
+		question: 'Where will you stay?',
+		fieldName: 'accommodation',
+		url: 'accommodation',
+		label: 'Select accommodation type',
+		options: [
+			{ value: 'hotel', text: 'Hotel' },
+			{ value: 'hostel', text: 'Hostel' },
+			{ value: 'apartment', text: 'Apartment' }
+		]
+	},
+	hotelStars: {
+		type: COMPONENT_TYPES.RADIO,
+		title: 'Hotel Stars',
+		question: 'How many stars for your hotel?',
+		fieldName: 'hotelStars',
+		url: 'hotel-stars',
+		label: 'Select star rating',
+		options: [
+			{ value: '3', text: '3 stars' },
+			{ value: '4', text: '4 stars' },
+			{ value: '5', text: '5 stars' }
+		]
+	},
+	hotelBreakfast: {
+		type: COMPONENT_TYPES.BOOLEAN,
+		title: 'Hotel Breakfast',
+		question: 'Do you want breakfast included?',
+		fieldName: 'hotelBreakfast',
+		url: 'hotel-breakfast',
+		label: 'Include breakfast?'
+	},
+	// Section 5: Contact (always shown)
+	contactEmail: {
+		type: COMPONENT_TYPES.EMAIL,
+		title: 'Contact Email',
+		question: 'What is your email address?',
+		fieldName: 'contactEmail',
+		url: 'contact-email',
+		label: 'Email address'
+	}
+};
+
+/**
+ * Create the questions for conditional tests
+ */
+const conditionalQuestions = createQuestions(conditionalQuestionProps, questionClasses, {});
+
+/**
+ * Create a single journey with various conditional logic scenarios:
+ *
+ * Section 1 - Insurance (simple + chained conditions):
+ *   - wantsInsurance: always shown
+ *   - insuranceLevel: shown if wantsInsurance = 'yes' (simple condition)
+ *   - premiumBenefits: shown if insuranceLevel = 'premium' (chained condition)
+ *
+ * Section 2 - Trip:
+ *   - tripType: always shown
+ *
+ * Section 3 - Visa (section-wide condition):
+ *   - Entire section shown only if tripType = 'international'
+ *   - visaRequired: shown if section condition met
+ *   - visaType: shown if section condition met AND visaRequired = 'yes'
+ *
+ * Section 4 - Accommodation (multi-question condition):
+ *   - accommodation: always shown
+ *   - hotelStars + hotelBreakfast: shown only if accommodation = 'hotel' (multi-question group)
+ *
+ * Section 5 - Contact:
+ *   - contactEmail: always shown
+ */
+function createConditionalJourney(questions, response) {
+	return new Journey({
+		journeyId: JOURNEY_ID,
+		sections: [
+			// Section 1: Insurance with simple and chained conditions
+			new Section('Insurance', 'insurance')
+				.addQuestion(questions.wantsInsurance)
+				.addQuestion(questions.insuranceLevel)
+				.withCondition(whenQuestionHasAnswer(questions.wantsInsurance, BOOLEAN_OPTIONS.YES))
+				.addQuestion(questions.premiumBenefits)
+				.withCondition(whenQuestionHasAnswer(questions.insuranceLevel, 'premium')),
+
+			// Section 2: Trip type (determines section condition for visa)
+			new Section('Trip Details', 'trip').addQuestion(questions.tripType),
+
+			// Section 3: Visa with section-wide condition
+			new Section('Visa', 'visa')
+				.withSectionCondition(whenQuestionHasAnswer(questions.tripType, 'international'))
+				.addQuestion(questions.visaRequired)
+				.addQuestion(questions.visaType)
+				.withCondition(whenQuestionHasAnswer(questions.visaRequired, BOOLEAN_OPTIONS.YES)),
+
+			// Section 4: Accommodation with multi-question condition
+			new Section('Accommodation', 'accommodation')
+				.addQuestion(questions.accommodation)
+				.startMultiQuestionCondition('hotel-group', whenQuestionHasAnswer(questions.accommodation, 'hotel'))
+				.addQuestion(questions.hotelStars)
+				.addQuestion(questions.hotelBreakfast)
+				.endMultiQuestionCondition('hotel-group'),
+
+			// Section 5: Contact (always shown)
+			new Section('Contact', 'contact').addQuestion(questions.contactEmail)
+		],
+		taskListUrl: 'check-your-answers',
+		journeyTemplate: 'views/layout-journey.njk',
+		taskListTemplate: 'views/layout-check-your-answers.njk',
+		journeyTitle: 'Conditional Journey',
+		returnToListing: false,
+		makeBaseUrl: () => '/',
+		initialBackLink: '/start',
+		response
+	});
+}
+
+/**
+ * Helper to create an app with the conditional journey
+ * @param {import('node:test').TestContext} ctx
+ * @returns {Promise<import('#test/utils/test-server.js').TestServer>}
+ */
+function createAppWithJourney(ctx) {
+	return createAppWithQuestions(ctx, {
+		journeyId: JOURNEY_ID,
+		questions: conditionalQuestions,
+		createJourneyFn: createConditionalJourney
+	});
+}
+
+const q = conditionalQuestionProps;
+
+describe('conditional journey tests', () => {
+	describe('simple condition (whenQuestionHasAnswer on single question)', () => {
+		it('should show conditional question when condition is met', async (ctx) => {
+			const testServer = await createAppWithJourney(ctx);
+
+			// First, render the initial question
+			await renderQuestionCheck(ctx, testServer, '/insurance/wants-insurance', q.wantsInsurance.question);
+
+			// Answer 'yes' to wantsInsurance
+			const location = await postAnswer(testServer, '/insurance/wants-insurance', {
+				[q.wantsInsurance.fieldName]: BOOLEAN_OPTIONS.YES
+			});
+
+			// Should redirect to insuranceLevel (conditional question)
+			assert.strictEqual(location, 'insurance/insurance-level');
+
+			// Render the conditional question
+			await renderQuestionCheck(ctx, testServer, '/insurance/insurance-level', q.insuranceLevel.question);
+		});
+
+		it('should skip conditional question when condition is not met', async (ctx) => {
+			const testServer = await createAppWithJourney(ctx);
+
+			// Answer 'no' to wantsInsurance
+			const location = await postAnswer(testServer, '/insurance/wants-insurance', {
+				[q.wantsInsurance.fieldName]: BOOLEAN_OPTIONS.NO
+			});
+
+			// Should skip insuranceLevel and premiumBenefits, go to next section (trip)
+			assert.strictEqual(location, 'trip/trip-type');
+		});
+	});
+
+	describe('chained conditions (multiple dependent conditions)', () => {
+		it('should show both conditional questions when all conditions are met', async (ctx) => {
+			const testServer = await createAppWithJourney(ctx);
+
+			// Answer 'yes' to wantsInsurance
+			await postAnswer(testServer, '/insurance/wants-insurance', {
+				[q.wantsInsurance.fieldName]: BOOLEAN_OPTIONS.YES
+			});
+
+			// Answer 'premium' to insuranceLevel
+			const location = await postAnswer(testServer, '/insurance/insurance-level', {
+				[q.insuranceLevel.fieldName]: 'premium'
+			});
+
+			// Should go to premiumBenefits
+			assert.strictEqual(location, 'insurance/premium-benefits');
+
+			// Render the premium benefits question
+			await renderQuestionCheck(ctx, testServer, '/insurance/premium-benefits', q.premiumBenefits.question);
+		});
+
+		it('should skip second conditional question when its condition is not met', async (ctx) => {
+			const testServer = await createAppWithJourney(ctx);
+
+			// Answer 'yes' to wantsInsurance
+			await postAnswer(testServer, '/insurance/wants-insurance', {
+				[q.wantsInsurance.fieldName]: BOOLEAN_OPTIONS.YES
+			});
+
+			// Answer 'basic' to insuranceLevel (not 'premium')
+			const location = await postAnswer(testServer, '/insurance/insurance-level', {
+				[q.insuranceLevel.fieldName]: 'basic'
+			});
+
+			// Should skip premiumBenefits and go to next section (trip)
+			assert.strictEqual(location, 'trip/trip-type');
+		});
+
+		it('should skip all conditional questions when first condition is not met', async (ctx) => {
+			const testServer = await createAppWithJourney(ctx);
+
+			// Answer 'no' to wantsInsurance
+			const location = await postAnswer(testServer, '/insurance/wants-insurance', {
+				[q.wantsInsurance.fieldName]: BOOLEAN_OPTIONS.NO
+			});
+
+			// Should skip insuranceLevel and premiumBenefits, go to next section (trip)
+			assert.strictEqual(location, 'trip/trip-type');
+		});
+	});
+
+	describe('section-wide conditions (withSectionCondition)', () => {
+		it('should show section questions when section condition is met', async (ctx) => {
+			const testServer = await createAppWithJourney(ctx);
+
+			// Answer 'international' to tripType
+			const location = await postAnswer(testServer, '/trip/trip-type', {
+				[q.tripType.fieldName]: 'international'
+			});
+
+			// Should go to visa section (visaRequired)
+			assert.strictEqual(location, 'visa/visa-required');
+
+			// Render the visa question
+			await renderQuestionCheck(ctx, testServer, '/visa/visa-required', q.visaRequired.question);
+		});
+
+		it('should skip entire section when section condition is not met', async (ctx) => {
+			const testServer = await createAppWithJourney(ctx);
+
+			// Answer 'domestic' to tripType
+			const location = await postAnswer(testServer, '/trip/trip-type', {
+				[q.tripType.fieldName]: 'domestic'
+			});
+
+			// Should skip visa section and go to accommodation section
+			assert.strictEqual(location, 'accommodation/accommodation');
+		});
+
+		it('should combine section condition with question condition', async (ctx) => {
+			const testServer = await createAppWithJourney(ctx);
+
+			// Answer 'international' to tripType
+			await postAnswer(testServer, '/trip/trip-type', {
+				[q.tripType.fieldName]: 'international'
+			});
+
+			// Answer 'yes' to visaRequired
+			const location = await postAnswer(testServer, '/visa/visa-required', {
+				[q.visaRequired.fieldName]: BOOLEAN_OPTIONS.YES
+			});
+
+			// Should go to visaType (condition met)
+			assert.strictEqual(location, 'visa/visa-type');
+
+			// Render the visa type question
+			await renderQuestionCheck(ctx, testServer, '/visa/visa-type', q.visaType.question);
+		});
+
+		it('should skip conditional question within section when its condition is not met', async (ctx) => {
+			const testServer = await createAppWithJourney(ctx);
+
+			// Answer 'international' to tripType
+			await postAnswer(testServer, '/trip/trip-type', {
+				[q.tripType.fieldName]: 'international'
+			});
+
+			// Answer 'no' to visaRequired
+			const location = await postAnswer(testServer, '/visa/visa-required', {
+				[q.visaRequired.fieldName]: BOOLEAN_OPTIONS.NO
+			});
+
+			// Should skip visaType and go to accommodation section
+			assert.strictEqual(location, 'accommodation/accommodation');
+		});
+	});
+
+	describe('multi-question conditions (startMultiQuestionCondition)', () => {
+		it('should show all questions in group when condition is met', async (ctx) => {
+			const testServer = await createAppWithJourney(ctx);
+
+			// Answer 'hotel' to accommodation
+			const location = await postAnswer(testServer, '/accommodation/accommodation', {
+				[q.accommodation.fieldName]: 'hotel'
+			});
+
+			// Should go to hotelStars (first question in group)
+			assert.strictEqual(location, 'accommodation/hotel-stars');
+
+			// Render the hotel stars question
+			await renderQuestionCheck(ctx, testServer, '/accommodation/hotel-stars', q.hotelStars.question);
+
+			// Answer hotelStars
+			const nextLocation = await postAnswer(testServer, '/accommodation/hotel-stars', {
+				[q.hotelStars.fieldName]: '4'
+			});
+
+			// Should go to hotelBreakfast (second question in group)
+			assert.strictEqual(nextLocation, 'accommodation/hotel-breakfast');
+
+			// Render the hotel breakfast question
+			await renderQuestionCheck(ctx, testServer, '/accommodation/hotel-breakfast', q.hotelBreakfast.question);
+		});
+
+		it('should skip all questions in group when condition is not met', async (ctx) => {
+			const testServer = await createAppWithJourney(ctx);
+
+			// Answer 'hostel' to accommodation (not 'hotel')
+			const location = await postAnswer(testServer, '/accommodation/accommodation', {
+				[q.accommodation.fieldName]: 'hostel'
+			});
+
+			// Should skip hotelStars and hotelBreakfast, go to contact section
+			assert.strictEqual(location, 'contact/contact-email');
+		});
+
+		it('should proceed to question after group ends', async (ctx) => {
+			const testServer = await createAppWithJourney(ctx);
+
+			// Answer 'hotel' to accommodation
+			await postAnswer(testServer, '/accommodation/accommodation', {
+				[q.accommodation.fieldName]: 'hotel'
+			});
+
+			// Answer hotelStars
+			await postAnswer(testServer, '/accommodation/hotel-stars', {
+				[q.hotelStars.fieldName]: '5'
+			});
+
+			// Answer hotelBreakfast (last in group)
+			const location = await postAnswer(testServer, '/accommodation/hotel-breakfast', {
+				[q.hotelBreakfast.fieldName]: BOOLEAN_OPTIONS.YES
+			});
+
+			// Should go to contact section (after group ends)
+			assert.strictEqual(location, 'contact/contact-email');
+		});
+	});
+});