@planning-inspectorate/dynamic-forms 2.0.3 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planning-inspectorate/dynamic-forms",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "This package is for building GDS forms using a configuration-based approach.",
   "main": "./src/index.js",
   "type": "module",

package/src/validator/address-validator.js

@@ -2,7 +2,7 @@ import { body } from 'express-validator';
 
 import BaseValidator from './base-validator.js';
 
-const validatePostcode = (postcode, errorMessage = 'Enter a valid postcode') => {
+export const validatePostcode = (postcode, errorMessage = 'Enter a valid postcode') => {
 	const pattern =
 		/([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([A-Za-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9][A-Za-z]?))))\s?[0-9][A-Za-z]{2})/;
 	const result = pattern.exec(postcode);
@@ -21,7 +21,7 @@ export const townCityMaxLength = 250;
 export const townCityMinLength = 0;
 export const countyMaxLength = 250;
 export const countyMinLength = 0;
-export const postcodeMaxLength = 7;
+export const postcodeMaxLength = 8;
 export const postcodeMinLength = 5;
 
 /**

package/src/validator/address-validator.test.js

@@ -113,6 +113,86 @@ describe('AddressValidator', () => {
 			`Postcode must be between ${postcodeMinLength} and ${postcodeMaxLength} characters`
 		);
 	});
+	it('should validate a valid 8-character postcode without errors', async () => {
+		const question = {
+			fieldName: 'testField'
+		};
+
+		const req = {
+			body: {
+				testField_addressLine1: 'A Building',
+				testField_addressLine2: 'A Street',
+				testField_townCity: 'Test town',
+				testField_postcode: 'DN55 1PT'
+			}
+		};
+
+		const errors = await _validationMappedErrors(req, question);
+
+		assert.deepStrictEqual(errors, {});
+	});
+	// New postcode tests
+	it('should validate a valid 5-character postcode without a space', async () => {
+		const question = { fieldName: 'testField' };
+		const req = {
+			body: {
+				testField_addressLine1: 'A Building',
+				testField_addressLine2: 'A Street',
+				testField_townCity: 'Test town',
+				testField_postcode: 'M11AA'
+			}
+		};
+		const errors = await _validationMappedErrors(req, question);
+		assert.deepStrictEqual(errors, {});
+	});
+
+	it('should reject a postcode with multiple spaces', async () => {
+		const question = { fieldName: 'testField' };
+		const req = {
+			body: {
+				testField_addressLine1: 'A Building',
+				testField_addressLine2: 'A Street',
+				testField_townCity: 'Test town',
+				testField_postcode: 'AB1  2CD'
+			}
+		};
+		const errors = await _validationMappedErrors(req, question);
+		assert.strictEqual(errors.testField_postcode.msg, 'Enter a valid postcode');
+	});
+
+	it('should reject a postcode shorter than 5 characters', async () => {
+		const question = { fieldName: 'testField' };
+		const req = {
+			body: {
+				testField_addressLine1: 'A Building',
+				testField_addressLine2: 'A Street',
+				testField_townCity: 'Test town',
+				testField_postcode: 'A1 1'
+			}
+		};
+		const errors = await _validationMappedErrors(req, question);
+		assert.strictEqual(
+			errors.testField_postcode.msg,
+			`Postcode must be between ${postcodeMinLength} and ${postcodeMaxLength} characters`
+		);
+	});
+
+	it('should reject a postcode longer than 8 characters', async () => {
+		const question = { fieldName: 'testField' };
+		const req = {
+			body: {
+				testField_addressLine1: 'A Building',
+				testField_addressLine2: 'A Street',
+				testField_townCity: 'Test town',
+				testField_postcode: 'DN55 1PTA'
+			}
+		};
+		const errors = await _validationMappedErrors(req, question);
+		assert.strictEqual(
+			errors.testField_postcode.msg,
+			`Postcode must be between ${postcodeMinLength} and ${postcodeMaxLength} characters`
+		);
+	});
 });
 
 const _validationMappedErrors = async (req, question) => {