diff --git a/src/server/plugins/engine/models/SummaryViewModel.test.ts b/src/server/plugins/engine/models/SummaryViewModel.test.ts index e5189dbd0..822209db5 100644 --- a/src/server/plugins/engine/models/SummaryViewModel.test.ts +++ b/src/server/plugins/engine/models/SummaryViewModel.test.ts @@ -279,11 +279,11 @@ describe('SummaryPageController', () => { }) describe('Save and Return functionality', () => { - it('should show save and return button on summary page', () => { - expect(controller.shouldShowSaveAndReturn(request.server)).toBe(true) + it('should not show save and return button on summary page by default', () => { + expect(controller.shouldShowSaveAndReturn(request.server)).toBe(false) }) - it('should handle save and return from summary page', () => { + it('should not handle save and return from summary page by default', () => { const state: FormState = { $$__referenceNumber: 'foobar', orderType: 'collection', @@ -293,7 +293,7 @@ describe('SummaryPageController', () => { const context = model.getFormContext(request, state) const viewModel = controller.getViewModel(request, context) - expect(viewModel).toHaveProperty('allowSaveAndReturn', true) + expect(viewModel).toHaveProperty('allowSaveAndReturn', false) }) it('should display correct page title', () => { diff --git a/src/server/plugins/engine/pageControllers/FileUploadPageController.test.ts b/src/server/plugins/engine/pageControllers/FileUploadPageController.test.ts index b7249f584..69b964556 100644 --- a/src/server/plugins/engine/pageControllers/FileUploadPageController.test.ts +++ b/src/server/plugins/engine/pageControllers/FileUploadPageController.test.ts @@ -1119,10 +1119,10 @@ describe('FileUploadPageController', () => { }) }) - describe('shouldShowSaveAndReturn', () => { - it('should return true when save and return is enabled', () => { + describe('shouldNotShowSaveAndReturnByDefault', () => { + it('should return false when save and return is disabled by default', () => { expect(controller.shouldShowSaveAndReturn(serverWithSaveAndReturn)).toBe( - true + false ) }) }) diff --git a/src/server/plugins/engine/pageControllers/QuestionPageController.test.ts b/src/server/plugins/engine/pageControllers/QuestionPageController.test.ts index 7555c6bcc..83aadc9bf 100644 --- a/src/server/plugins/engine/pageControllers/QuestionPageController.test.ts +++ b/src/server/plugins/engine/pageControllers/QuestionPageController.test.ts @@ -1327,7 +1327,7 @@ describe('Save and Return functionality', () => { describe('shouldShowSaveAndReturn', () => { it('should return true by default', () => { expect(controller1.shouldShowSaveAndReturn(serverWithSaveAndReturn)).toBe( - true + false ) }) }) diff --git a/src/server/plugins/engine/pageControllers/QuestionPageController.ts b/src/server/plugins/engine/pageControllers/QuestionPageController.ts index c43afb82f..792fcb7d1 100644 --- a/src/server/plugins/engine/pageControllers/QuestionPageController.ts +++ b/src/server/plugins/engine/pageControllers/QuestionPageController.ts @@ -51,7 +51,6 @@ import { merge } from '~/src/server/services/cacheService.js' export class QuestionPageController extends PageController { collection: ComponentCollection errorSummaryTitle = 'There is a problem' - allowSaveAndReturn = true constructor(model: FormModel, pageDef: Page) { super(model, pageDef) diff --git a/src/server/plugins/engine/pageControllers/RepeatPageController.test.ts b/src/server/plugins/engine/pageControllers/RepeatPageController.test.ts index f9b4b5c00..6c4ba4ec7 100644 --- a/src/server/plugins/engine/pageControllers/RepeatPageController.test.ts +++ b/src/server/plugins/engine/pageControllers/RepeatPageController.test.ts @@ -271,10 +271,10 @@ describe('RepeatPageController', () => { }) }) - describe('shouldShowSaveAndReturn', () => { - it('should return true when save and return is enabled', () => { + describe('shouldNotShowSaveAndReturnByDefault', () => { + it('should return false when save and return is disabled by default', () => { expect(controller.shouldShowSaveAndReturn(serverWithSaveAndReturn)).toBe( - true + false ) }) }) diff --git a/test/form/save-and-return.test.js b/test/form/save-and-return.test.js index f3cd83989..6efeca9f4 100644 --- a/test/form/save-and-return.test.js +++ b/test/form/save-and-return.test.js @@ -57,20 +57,17 @@ describe('Save and Return functionality', () => { }) describe('Save and Return button', () => { - it('should render the save and return button on question pages with the correct name and value attributes', async () => { + it('should not render the save and return button on question pages with the correct name and value attributes', async () => { const { container } = await renderResponse(server, { url: `${basePath}/licence`, headers }) - const $saveButton = container.getByRole('button', { + const $saveButton = container.queryByRole('button', { name: 'Save and return' }) - expect($saveButton).toBeInTheDocument() - expect($saveButton).toHaveClass('govuk-button--secondary') - expect($saveButton).toHaveAttribute('name', 'action') - expect($saveButton).toHaveAttribute('value', 'save-and-return') + expect($saveButton).not.toBeInTheDocument() }) })