Skip to content
Merged
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
43 changes: 41 additions & 2 deletions src/server/plugins/engine/components/UkAddressField.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { ComponentType, type UkAddressFieldComponent } from '@defra/forms-model'
import {
ComponentType,
type TextFieldComponent,
type UkAddressFieldComponent
} from '@defra/forms-model'

import { ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js'
import { UkAddressField } from '~/src/server/plugins/engine/components/UkAddressField.js'
import {
getAnswer,
type Field
Expand Down Expand Up @@ -272,6 +277,40 @@ describe('UkAddressField', () => {
expect(result2.errors).toBeTruthy()
expect(result3.errors).toBeTruthy()
})

it('should ensure all address fields have valid autocomplete values', () => {
const ukAddressField = new UkAddressField(
{
type: ComponentType.UkAddressField,
name: 'testAddress',
title: 'Test Address',
options: {
required: true,
hideTitle: false
}
},
{
model
}
)

const expectedAutocompleteValues = [
'address-line1',
'address-line2',
'address-level1',
'address-level2',
'postal-code'
]

ukAddressField.collection.components.forEach((component) => {
const addressFieldOptions =
component.options as TextFieldComponent['options']

expect(expectedAutocompleteValues).toContain(
addressFieldOptions.autocomplete
)
})
})
})

describe('State', () => {
Expand Down Expand Up @@ -396,7 +435,7 @@ describe('UkAddressField', () => {
expect.objectContaining({
model: getViewModel(address, 'county', {
label: { text: 'County (optional)' },
attributes: { autocomplete: 'county' },
attributes: { autocomplete: 'address-level1' },
value: address.county
})
}),
Expand Down
2 changes: 1 addition & 1 deletion src/server/plugins/engine/components/UkAddressField.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export class UkAddressField extends FormComponent {
title: 'County',
schema: { max: 100 },
options: {
autocomplete: 'county',
autocomplete: 'address-level1',
required: false,
optionalText: !isRequired && (hideOptional || !hideTitle)
}
Expand Down
Loading