Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/server/plugins/postcode-lookup/models/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -343,9 +343,14 @@ export const manualPayloadSchema = Joi.object()
'*': 'Enter town or city'
}),
[countyFieldName]: Joi.string().trim().allow('').required(),
[postcodeFieldName]: Joi.string().trim().required().messages({
'*': 'Enter postcode'
})
[postcodeFieldName]: Joi.string()
.pattern(/^[a-zA-Z]{1,2}\d[a-zA-Z\d]?\s?\d[a-zA-Z]{2}$/)
.trim()
.required()
.messages({
'string.pattern.base': 'Enter a valid postcode',
'*': 'Enter postcode'
})
})
.required()

Expand Down
45 changes: 45 additions & 0 deletions test/form/postcode-lookup.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,51 @@ describe('Postcode lookup form pages', () => {
expect($heading).toBeInTheDocument()
})

it('should render validation error when invalid postcode is provided on manual page', async () => {
const { csrfToken, headers } = await initialiseJourney(server)

// Dispatch to postcode journey
await server.inject({
url: `${basePath}/address`,
method: 'POST',
headers,
payload: {
action: 'external-ybMHIv',
crumb: csrfToken
}
})

const { response, container } = await renderResponse(server, {
url: '/postcode-lookup?step=manual',
method: 'POST',
headers,
payload: {
step: 'manual',
addressLine1: '1 Street Name',
addressLine2: '',
town: 'Middletown',
county: '',
postcode: 'INVALID123',
crumb: csrfToken
}
})

expect(response.statusCode).toBe(StatusCodes.OK)
const $errorSummary = container.getByRole('alert')

const $heading = within($errorSummary).getByRole('heading', {
name: 'There is a problem',
level: 2
})
expect($heading).toBeInTheDocument()

// Verify the specific postcode error message is shown
const $postcodeError = container.getByRole('link', {
name: 'Enter a valid postcode'
})
expect($postcodeError).toBeInTheDocument()
})

it('should redirect back to the source page after successful POST to manual page', async () => {
const { csrfToken, headers } = await initialiseJourney(server)

Expand Down
Loading