Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADJUST1-444 DR: Confirm and save remand #182

Merged
merged 3 commits into from
Feb 29, 2024
Merged

ADJUST1-444 DR: Confirm and save remand #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
095184f
Reworded text in confirm save remand page
Feb 27, 2024
e6a3fdb
Fixed integration test
Feb 29, 2024
4105ebc
Adjusted int test
Feb 29, 2024
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
2 changes: 1 addition & 1 deletion integration_tests/pages/saveRemand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { PageElement } from './page'

export default class SaveRemandPage extends AdjustmentsPage {
constructor() {
super('Save remand details')
super('Confirm and save')
}

public submit = (): PageElement => cy.get('[data-qa=submit-form]')
Expand Down
2 changes: 1 addition & 1 deletion server/model/remandSaveModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default class RemandSaveModel {

public table() {
return {
head: [{ text: 'Period of remand' }, { text: 'Days spent on remand' }],
head: [{ text: 'Remand period' }, { text: 'Days spent on remand' }],
rows: [...this.rows(), this.totalRow()],
}
}
Expand Down
4 changes: 2 additions & 2 deletions server/routes/remandRoutes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,11 +583,11 @@ describe('Remand routes tests', () => {
.expect(res => {
expect(res.text).toContain('Anon')
expect(res.text).toContain('Nobody')
expect(res.text).toContain('Save remand details')
expect(res.text).toContain('Confirm and save')
expect(res.text).toContain(
'Once the remand time has been saved, this service will record unused deductions. You may need to add the unused remand alert on NOMIS.',
)
expect(res.text).toContainInOrder(['Period of remand', 'Days spent on remand', '10', 'Total days', '10'])
expect(res.text).toContainInOrder(['Remand period', 'Days spent on remand', '10', 'Total days', '10'])
})
})
it('GET /{nomsId}/remand/save error from deductions', () => {
Expand Down
4 changes: 2 additions & 2 deletions server/views/pages/adjustments/remand/save.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-l">
<span class="govuk-caption-xl">Adjust release dates</span>
Save remand details
Confirm and save
</h1>
</div>
</div>
Expand All @@ -60,7 +60,7 @@
<input type="hidden" name="_csrf" value="{{ csrfToken }}"/>
<div class="govuk-button-group">
{{ govukButton({
text: "Continue",
text: "Confirm and save",
type: submit,
preventDoubleClick: true,
attributes: { 'data-qa': 'submit-form' }
Expand Down