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
1 change: 1 addition & 0 deletions jest.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module.exports = {
'<rootDir>/src/**/*.{cjs,js,mjs,ts}',
'<rootDir>/scripts/**/*.{cjs,js,mjs}'
],
modulePathIgnorePatterns: ['<rootDir>/coverage/', '<rootDir>/.server/'],
coveragePathIgnorePatterns: [
'<rootDir>/node_modules/',
'<rootDir>/.server',
Expand Down
254 changes: 142 additions & 112 deletions src/server/plugins/engine/models/SummaryViewModel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ describe('SummaryViewModel', () => {
'Pizzas',
'Pizza'
],
values: ['Collection', 'Not supplied']
values: ['Collection', 'Not supplied'],
answers: ['Collection', ''],
names: ['orderType', 'pizza']
},
{
description: '1 item',
Expand All @@ -87,7 +89,9 @@ describe('SummaryViewModel', () => {
'Pizzas',
'Pizza'
],
values: ['Delivery', 'You added 1 Pizza']
values: ['Delivery', 'You added 1 Pizza'],
answers: ['Delivery', 'You added 1 Pizza'],
names: ['orderType', 'pizza']
},
{
description: '2 items',
Expand All @@ -114,142 +118,168 @@ describe('SummaryViewModel', () => {
'Pizzas',
'Pizza'
],
values: ['Delivery', 'You added 2 Pizzas']
values: ['Delivery', 'You added 2 Pizzas'],
answers: ['Delivery', 'You added 2 Pizzas'],
names: ['orderType', 'pizza']
}
])('Check answers ($description)', ({ state, keys, values }) => {
beforeEach(() => {
context = model.getFormContext(request, state)
summaryViewModel = new SummaryViewModel(request, page, context)
})
])(
'Check answers ($description)',
({ state, keys, values, names, answers }) => {
beforeEach(() => {
context = model.getFormContext(request, state)
summaryViewModel = new SummaryViewModel(request, page, context)
})

it('should add title for each section', () => {
const [checkAnswers1, checkAnswers2] = summaryViewModel.checkAnswers
it('should add title for each section', () => {
const [checkAnswers1, checkAnswers2] = summaryViewModel.checkAnswers

// 1st summary list has no title
expect(checkAnswers1).toHaveProperty('title', undefined)
// 1st summary list has no title
expect(checkAnswers1).toHaveProperty('title', undefined)

// 2nd summary list has section title
expect(checkAnswers2).toHaveProperty('title', {
text: 'Food'
// 2nd summary list has section title
expect(checkAnswers2).toHaveProperty('title', {
text: 'Food'
})
})
})

it('should add summary list for each section', () => {
expect(summaryViewModel.checkAnswers).toHaveLength(2)
it('should add summary list for each section', () => {
expect(summaryViewModel.checkAnswers).toHaveLength(2)

const [checkAnswers1, checkAnswers2] = summaryViewModel.checkAnswers
const [checkAnswers1, checkAnswers2] = summaryViewModel.checkAnswers

const { summaryList: summaryList1 } = checkAnswers1
const { summaryList: summaryList2 } = checkAnswers2
const { summaryList: summaryList1 } = checkAnswers1
const { summaryList: summaryList2 } = checkAnswers2

expect(summaryList1).toHaveProperty('rows', [
{
key: {
text: keys[2]
},
value: {
classes: 'app-prose-scope',
html: values[0]
},
actions: {
items: [
{
classes: 'govuk-link--no-visited-state',
href: `${basePath}/delivery-or-collection?returnUrl=${encodeURIComponent(`${basePath}/summary`)}`,
text: 'Change',
visuallyHiddenText: keys[0]
}
]
expect(summaryList1).toHaveProperty('rows', [
{
key: {
text: keys[2]
},
value: {
classes: 'app-prose-scope',
html: values[0]
},
actions: {
items: [
{
classes: 'govuk-link--no-visited-state',
href: `${basePath}/delivery-or-collection?returnUrl=${encodeURIComponent(`${basePath}/summary`)}`,
text: 'Change',
visuallyHiddenText: keys[0]
}
]
}
}
}
])
])

expect(summaryList2).toHaveProperty('rows', [
{
key: {
text: keys[1]
},
value: {
classes: 'app-prose-scope',
html: values[1]
},
actions: {
items: [
{
classes: 'govuk-link--no-visited-state',
href: `${basePath}/pizza-order/summary?returnUrl=${encodeURIComponent(`${basePath}/summary`)}`,
text: 'Change',
visuallyHiddenText: 'Pizza'
}
]
expect(summaryList2).toHaveProperty('rows', [
{
key: {
text: keys[1]
},
value: {
classes: 'app-prose-scope',
html: values[1]
},
actions: {
items: [
{
classes: 'govuk-link--no-visited-state',
href: `${basePath}/pizza-order/summary?returnUrl=${encodeURIComponent(`${basePath}/summary`)}`,
text: 'Change',
visuallyHiddenText: 'Pizza'
}
]
}
}
}
])
})
])
})

it('should add summary list for each section (preview URL direct access)', () => {
request.query.force = '' // Preview URL '?force'
context = model.getFormContext(request, state)
summaryViewModel = new SummaryViewModel(request, page, context)
it('should add summary list for each section (preview URL direct access)', () => {
request.query.force = '' // Preview URL '?force'
context = model.getFormContext(request, state)
summaryViewModel = new SummaryViewModel(request, page, context)

expect(summaryViewModel.checkAnswers).toHaveLength(2)
expect(summaryViewModel.checkAnswers).toHaveLength(2)

const [checkAnswers1, checkAnswers2] = summaryViewModel.checkAnswers
const [checkAnswers1, checkAnswers2] = summaryViewModel.checkAnswers

const { summaryList: summaryList1 } = checkAnswers1
const { summaryList: summaryList2 } = checkAnswers2
const { summaryList: summaryList1 } = checkAnswers1
const { summaryList: summaryList2 } = checkAnswers2

expect(summaryList1).toHaveProperty('rows', [
{
key: {
text: keys[2]
},
value: {
classes: 'app-prose-scope',
html: values[0]
},
actions: {
items: []
expect(summaryList1).toHaveProperty('rows', [
{
key: {
text: keys[2]
},
value: {
classes: 'app-prose-scope',
html: values[0]
},
actions: {
items: []
}
}
}
])
])

expect(summaryList2).toHaveProperty('rows', [
{
key: {
text: keys[1]
},
value: {
classes: 'app-prose-scope',
html: values[1]
},
actions: {
items: []
expect(summaryList2).toHaveProperty('rows', [
{
key: {
text: keys[1]
},
value: {
classes: 'app-prose-scope',
html: values[1]
},
actions: {
items: []
}
}
}
])
})
])
})

it('should use correct summary labels', () => {
request.query.force = '' // Preview URL '?force'
context = model.getFormContext(request, state)
summaryViewModel = new SummaryViewModel(request, page, context)
it('should use correct summary labels', () => {
request.query.force = '' // Preview URL '?force'
context = model.getFormContext(request, state)
summaryViewModel = new SummaryViewModel(request, page, context)

expect(summaryViewModel.details).toHaveLength(2)
expect(summaryViewModel.details).toHaveLength(2)

const [details1, details2] = summaryViewModel.details
const [details1, details2] = summaryViewModel.details

expect(details1.items[0]).toMatchObject({
title: keys[2],
label: keys[0]
})
expect(details1.items[0]).toMatchObject({
name: names[0],
value: answers[0],
title: keys[2],
label: keys[0]
})

expect(details2.items[0]).toMatchObject({
name: names[1],
value: answers[1],
title: keys[1],
label: keys[4]
})

expect(details2.items[0]).toMatchObject({
title: keys[1],
label: keys[4]
const snapshot = [
{
name: names[0],
value: answers[0],
title: keys[2],
label: keys[0]
},
{
name: names[1],
value: answers[1],
title: keys[1],
label: keys[4]
}
]

expect(snapshot).toMatchSnapshot()
})
})
})
}
)
})

describe('SummaryPageController', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing

exports[`SummaryViewModel Check answers (0 items) should use correct summary labels 1`] = `
[
{
"label": "How would you like to receive your pizza?",
"name": "orderType",
"title": "How you would like to receive your pizza",
"value": "Collection",
},
{
"label": "Pizza",
"name": "pizza",
"title": "Pizzas",
"value": "",
},
]
`;

exports[`SummaryViewModel Check answers (1 item) should use correct summary labels 1`] = `
[
{
"label": "How would you like to receive your pizza?",
"name": "orderType",
"title": "How you would like to receive your pizza",
"value": "Delivery",
},
{
"label": "Pizza",
"name": "pizza",
"title": "Pizza added",
"value": "You added 1 Pizza",
},
]
`;

exports[`SummaryViewModel Check answers (2 items) should use correct summary labels 1`] = `
[
{
"label": "How would you like to receive your pizza?",
"name": "orderType",
"title": "How you would like to receive your pizza",
"value": "Delivery",
},
{
"label": "Pizza",
"name": "pizza",
"title": "Pizzas added",
"value": "You added 2 Pizzas",
},
]
`;
Loading
Loading