From e244d612fb847f56852b4742d2f664d75c0a4950 Mon Sep 17 00:00:00 2001 From: Alan Cruikshanks Date: Sun, 20 Oct 2024 19:52:08 +0100 Subject: [PATCH] Fix more missed links --- app/presenters/licences/view-licence-history.presenter.js | 2 +- .../return-requirements-setup.controller.test.js | 6 +++--- test/presenters/licences/set-up.presenter.test.js | 4 ++-- .../licences/view-licence-history.presenter.test.js | 4 ++-- .../setup/abstraction-period.presenter.test.js | 6 +++--- .../setup/additional-submission-options.presenter.test.js | 4 ++-- .../setup/agreements-exceptions.presenter.test.js | 6 +++--- .../return-requirements/setup/cancel.presenter.test.js | 2 +- .../setup/frequency-collected.presenter.test.js | 6 +++--- .../setup/frequency-reported.presenter.test.js | 6 +++--- .../return-requirements/setup/method.presenter.test.js | 4 ++-- .../setup/no-returns-required.presenter.test.js | 6 +++--- .../return-requirements/setup/note.presenter.test.js | 4 ++-- .../return-requirements/setup/points.presenter.test.js | 6 +++--- .../return-requirements/setup/purpose.presenter.test.js | 8 ++++---- .../return-requirements/setup/reason.presenter.test.js | 6 +++--- .../return-requirements/setup/remove.presenter.test.js | 4 ++-- .../setup/returns-cycle.presenter.test.js | 6 +++--- .../setup/site-description.presenter.test.js | 6 +++--- .../setup/start-date.presenter.test.js | 2 +- .../licences/view-licence-history.service.test.js | 2 +- 21 files changed, 50 insertions(+), 50 deletions(-) diff --git a/app/presenters/licences/view-licence-history.presenter.js b/app/presenters/licences/view-licence-history.presenter.js index 067ae99de6..0962eb811b 100644 --- a/app/presenters/licences/view-licence-history.presenter.js +++ b/app/presenters/licences/view-licence-history.presenter.js @@ -97,7 +97,7 @@ function _returnVersionEntries (licence) { dateCreated: formatLongDate(createdAt), displayNote: notes.length > 0, notes, - link: `/system/return-requirements/${returnVersion.id}/view`, + link: `/system/return-requirements/${returnVersion.id}`, reason: mappedReason ?? reason, type: { index: 2, name: 'Return version' } } diff --git a/test/controllers/return-requirements-setup.controller.test.js b/test/controllers/return-requirements-setup.controller.test.js index 77b7797752..f97e80ca31 100644 --- a/test/controllers/return-requirements-setup.controller.test.js +++ b/test/controllers/return-requirements-setup.controller.test.js @@ -111,7 +111,7 @@ describe('Return requirements controller', () => { Sinon.stub(SubmitAbstractionPeriod, 'go').resolves({}) }) - it('redirects to /system/return-requirements/{sessionId}/returns-cycle/{requirementIndex}', async () => { + it('redirects to /system/return-requirements/setup/{sessionId}/returns-cycle/{requirementIndex}', async () => { const response = await server.inject(_postOptions(path, requirementIndex)) expect(response.statusCode).to.equal(302) @@ -349,7 +349,7 @@ describe('Return requirements controller', () => { Sinon.stub(SubmitExistingService, 'go').resolves({}) }) - it('redirects to /system/return-requirements/{sessionId}/check', async () => { + it('redirects to /system/return-requirements/setup/{sessionId}/check', async () => { const response = await server.inject(_postOptions(path)) expect(response.statusCode).to.equal(302) @@ -413,7 +413,7 @@ describe('Return requirements controller', () => { Sinon.stub(SubmitFrequencyCollectedService, 'go').resolves({ checkPageVisited: true }) }) - it('redirects to /system/return-requirements/{sessionId}/check', async () => { + it('redirects to /system/return-requirements/setup/{sessionId}/check', async () => { const response = await server.inject(_postOptions(path, requirementIndex)) expect(response.statusCode).to.equal(302) diff --git a/test/presenters/licences/set-up.presenter.test.js b/test/presenters/licences/set-up.presenter.test.js index 10fbb5fced..e7010c6b0a 100644 --- a/test/presenters/licences/set-up.presenter.test.js +++ b/test/presenters/licences/set-up.presenter.test.js @@ -575,7 +575,7 @@ describe('Licences - Set Up presenter', () => { { action: [ { - link: '/system/return-requirements/0312e5eb-67ae-44fb-922c-b1a0b81bc08d', + link: '/system/return-requirements/setup/0312e5eb-67ae-44fb-922c-b1a0b81bc08d', text: 'View' } ], @@ -601,7 +601,7 @@ describe('Licences - Set Up presenter', () => { { action: [ { - link: '/system/return-requirements/0312e5eb-67ae-44fb-922c-b1a0b81bc08d', + link: '/system/return-requirements/setup/0312e5eb-67ae-44fb-922c-b1a0b81bc08d', text: 'View' } ], diff --git a/test/presenters/licences/view-licence-history.presenter.test.js b/test/presenters/licences/view-licence-history.presenter.test.js index 7bbd13bf55..4802404a68 100644 --- a/test/presenters/licences/view-licence-history.presenter.test.js +++ b/test/presenters/licences/view-licence-history.presenter.test.js @@ -61,7 +61,7 @@ describe('View Licence History presenter', () => { dateCreated: '5 April 2021', displayNote: true, notes: ['Test note'], - link: '/system/return-requirements/3f09ce0b-288c-4c0b-b519-7329fe70a6cc/view', + link: '/system/return-requirements/setup/3f09ce0b-288c-4c0b-b519-7329fe70a6cc/view', reason: 'New licence', type: { index: 2, name: 'Return version' } } @@ -131,7 +131,7 @@ describe('View Licence History presenter', () => { it('returns the return version link', () => { const result = ViewLicenceHistoryPresenter.go(licence) - expect(result.entries[2].link).to.equal('/system/return-requirements/3f09ce0b-288c-4c0b-b519-7329fe70a6cc/view') + expect(result.entries[2].link).to.equal('/system/return-requirements/setup/3f09ce0b-288c-4c0b-b519-7329fe70a6cc/view') }) }) }) diff --git a/test/presenters/return-requirements/setup/abstraction-period.presenter.test.js b/test/presenters/return-requirements/setup/abstraction-period.presenter.test.js index 149166ba83..7daf475d62 100644 --- a/test/presenters/return-requirements/setup/abstraction-period.presenter.test.js +++ b/test/presenters/return-requirements/setup/abstraction-period.presenter.test.js @@ -40,7 +40,7 @@ describe('Return Requirements Setup - Abstraction Period presenter', () => { expect(result).to.equal({ abstractionPeriod: null, - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/points/0', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/points/0', licenceId: '8b7f78ba-f3ad-4cb6-a058-78abc4d1383d', licenceRef: '01/ABC', sessionId: '61e07498-f309-4829-96a9-72084a54996d' @@ -89,7 +89,7 @@ describe('Return Requirements Setup - Abstraction Period presenter', () => { it('returns a link back to the "check" page', () => { const result = AbstractionPeriodPresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) @@ -97,7 +97,7 @@ describe('Return Requirements Setup - Abstraction Period presenter', () => { it('returns a link back to the "points" page', () => { const result = AbstractionPeriodPresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/points/0') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/points/0') }) }) }) diff --git a/test/presenters/return-requirements/setup/additional-submission-options.presenter.test.js b/test/presenters/return-requirements/setup/additional-submission-options.presenter.test.js index 3e3159d532..ce86739950 100644 --- a/test/presenters/return-requirements/setup/additional-submission-options.presenter.test.js +++ b/test/presenters/return-requirements/setup/additional-submission-options.presenter.test.js @@ -37,7 +37,7 @@ describe('Return Requirements Setup - Additional Submission Options presenter', const result = AdditionalSubmissionOptionsPresenter.go(session) expect(result).to.be.equal({ - backLink: `/system/return-requirements/${session.id}/check`, + backLink: `/system/return-requirements/setup/${session.id}/check`, licenceId: '8b7f78ba-f3ad-4cb6-a058-78abc4d1383d', additionalSubmissionOptions: [], licenceRef: '01/ABC', @@ -50,7 +50,7 @@ describe('Return Requirements Setup - Additional Submission Options presenter', it('returns a link back to the "check" page', () => { const result = AdditionalSubmissionOptionsPresenter.go(session) - expect(result.backLink).to.equal(`/system/return-requirements/${session.id}/check`) + expect(result.backLink).to.equal(`/system/return-requirements/setup/${session.id}/check`) }) }) diff --git a/test/presenters/return-requirements/setup/agreements-exceptions.presenter.test.js b/test/presenters/return-requirements/setup/agreements-exceptions.presenter.test.js index 4d7ebc73f3..f9a2a09140 100644 --- a/test/presenters/return-requirements/setup/agreements-exceptions.presenter.test.js +++ b/test/presenters/return-requirements/setup/agreements-exceptions.presenter.test.js @@ -40,7 +40,7 @@ describe('Return Requirements Setup - Agreements Exceptions presenter', () => { expect(result).to.equal({ agreementsExceptions: null, - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/frequency-reported/0', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/frequency-reported/0', licenceId: '8b7f78ba-f3ad-4cb6-a058-78abc4d1383d', licenceRef: '01/ABC', sessionId: '61e07498-f309-4829-96a9-72084a54996d' @@ -79,7 +79,7 @@ describe('Return Requirements Setup - Agreements Exceptions presenter', () => { it('returns a link back to the "check" page', () => { const result = AgreementsExceptionsPresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) @@ -87,7 +87,7 @@ describe('Return Requirements Setup - Agreements Exceptions presenter', () => { it('returns a link back to the "frequency-reported" page', () => { const result = AgreementsExceptionsPresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/frequency-reported/0') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/frequency-reported/0') }) }) }) diff --git a/test/presenters/return-requirements/setup/cancel.presenter.test.js b/test/presenters/return-requirements/setup/cancel.presenter.test.js index 198f6a5fca..9c02fed1ae 100644 --- a/test/presenters/return-requirements/setup/cancel.presenter.test.js +++ b/test/presenters/return-requirements/setup/cancel.presenter.test.js @@ -57,7 +57,7 @@ describe('Return Requirements Setup - Cancel presenter', () => { const result = CancelPresenter.go(session) expect(result).to.equal({ - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check', licenceId: '8b7f78ba-f3ad-4cb6-a058-78abc4d1383d', licenceRef: '01/ABC', reason: 'Major change', diff --git a/test/presenters/return-requirements/setup/frequency-collected.presenter.test.js b/test/presenters/return-requirements/setup/frequency-collected.presenter.test.js index 5e49a44844..811fc07489 100644 --- a/test/presenters/return-requirements/setup/frequency-collected.presenter.test.js +++ b/test/presenters/return-requirements/setup/frequency-collected.presenter.test.js @@ -39,7 +39,7 @@ describe('Return Requirements Setup - Frequency Collected presenter', () => { const result = FrequencyCollectedPresenter.go(session, requirementIndex) expect(result).to.equal({ - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/site-description/0', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/site-description/0', frequencyCollected: null, licenceId: '8b7f78ba-f3ad-4cb6-a058-78abc4d1383d', licenceRef: '01/ABC', @@ -57,7 +57,7 @@ describe('Return Requirements Setup - Frequency Collected presenter', () => { it('returns a link back to the "check" page', () => { const result = FrequencyCollectedPresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) @@ -65,7 +65,7 @@ describe('Return Requirements Setup - Frequency Collected presenter', () => { it('returns a link back to the "site-description" page', () => { const result = FrequencyCollectedPresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/site-description/0') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/site-description/0') }) }) }) diff --git a/test/presenters/return-requirements/setup/frequency-reported.presenter.test.js b/test/presenters/return-requirements/setup/frequency-reported.presenter.test.js index 52c901fa71..5c7ee3f842 100644 --- a/test/presenters/return-requirements/setup/frequency-reported.presenter.test.js +++ b/test/presenters/return-requirements/setup/frequency-reported.presenter.test.js @@ -39,7 +39,7 @@ describe('Return Requirements Setup - Frequency Reported presenter', () => { const result = FrequencyReportedPresenter.go(session, requirementIndex) expect(result).to.equal({ - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/frequency-collected/0', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/frequency-collected/0', frequencyReported: null, licenceId: '8b7f78ba-f3ad-4cb6-a058-78abc4d1383d', licenceRef: '01/ABC', @@ -57,7 +57,7 @@ describe('Return Requirements Setup - Frequency Reported presenter', () => { it('returns a link back to the "check" page', () => { const result = FrequencyReportedPresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) @@ -65,7 +65,7 @@ describe('Return Requirements Setup - Frequency Reported presenter', () => { it('returns a link back to the "frequency-collected" page', () => { const result = FrequencyReportedPresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/frequency-collected/0') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/frequency-collected/0') }) }) }) diff --git a/test/presenters/return-requirements/setup/method.presenter.test.js b/test/presenters/return-requirements/setup/method.presenter.test.js index 1800621895..0d5348ea75 100644 --- a/test/presenters/return-requirements/setup/method.presenter.test.js +++ b/test/presenters/return-requirements/setup/method.presenter.test.js @@ -42,7 +42,7 @@ describe('Return Requirements Setup - Method presenter', () => { const result = MethodPresenter.go(session) expect(result).to.equal({ - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/reason', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/reason', displayCopyExisting: true, licenceRef: '01/ABC', sessionId: '61e07498-f309-4829-96a9-72084a54996d', @@ -55,7 +55,7 @@ describe('Return Requirements Setup - Method presenter', () => { it('returns a link back to the "start-date" page', () => { const result = MethodPresenter.go(session) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/reason') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/reason') }) }) diff --git a/test/presenters/return-requirements/setup/no-returns-required.presenter.test.js b/test/presenters/return-requirements/setup/no-returns-required.presenter.test.js index 945f36a6cc..3cd66f32cc 100644 --- a/test/presenters/return-requirements/setup/no-returns-required.presenter.test.js +++ b/test/presenters/return-requirements/setup/no-returns-required.presenter.test.js @@ -36,7 +36,7 @@ describe('Return Requirements Setup - No Returns Required presenter', () => { const result = NoReturnsRequiredPresenter.go(session) expect(result).to.equal({ - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/start-date', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/start-date', licenceRef: '01/ABC', reason: null, sessionId: '61e07498-f309-4829-96a9-72084a54996d' @@ -53,7 +53,7 @@ describe('Return Requirements Setup - No Returns Required presenter', () => { it('returns a link back to the "check" page', () => { const result = NoReturnsRequiredPresenter.go(session) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) @@ -61,7 +61,7 @@ describe('Return Requirements Setup - No Returns Required presenter', () => { it('returns a link back to the "start-date" page', () => { const result = NoReturnsRequiredPresenter.go(session) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/start-date') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/start-date') }) }) }) diff --git a/test/presenters/return-requirements/setup/note.presenter.test.js b/test/presenters/return-requirements/setup/note.presenter.test.js index e00036a28d..8e493fd9cc 100644 --- a/test/presenters/return-requirements/setup/note.presenter.test.js +++ b/test/presenters/return-requirements/setup/note.presenter.test.js @@ -37,7 +37,7 @@ describe('Return Requirements Setup - Note presenter', () => { const result = NotePresenter.go(session) expect(result).to.be.equal({ - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check', licenceRef: '01/ABC', note: null, sessionId: '61e07498-f309-4829-96a9-72084a54996d' @@ -49,7 +49,7 @@ describe('Return Requirements Setup - Note presenter', () => { it('returns a link back to the "check" page', () => { const result = NotePresenter.go(session) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) diff --git a/test/presenters/return-requirements/setup/points.presenter.test.js b/test/presenters/return-requirements/setup/points.presenter.test.js index 1da04416c6..11eb5c2fd3 100644 --- a/test/presenters/return-requirements/setup/points.presenter.test.js +++ b/test/presenters/return-requirements/setup/points.presenter.test.js @@ -45,7 +45,7 @@ describe('Return Requirements Setup - Points presenter', () => { const result = PointsPresenter.go(session, requirementIndex, points) expect(result).to.equal({ - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/purpose/0', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/purpose/0', licenceId: '8b7f78ba-f3ad-4cb6-a058-78abc4d1383d', licencePoints: [{ id: 'd03d7d7c-4e33-4b4d-ac9b-6ebac9a5e5f6', @@ -73,7 +73,7 @@ describe('Return Requirements Setup - Points presenter', () => { it('returns a link back to the "check" page', () => { const result = PointsPresenter.go(session, requirementIndex, points) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) @@ -81,7 +81,7 @@ describe('Return Requirements Setup - Points presenter', () => { it('returns a link back to the "purpose" page', () => { const result = PointsPresenter.go(session, requirementIndex, points) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/purpose/0') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/purpose/0') }) }) }) diff --git a/test/presenters/return-requirements/setup/purpose.presenter.test.js b/test/presenters/return-requirements/setup/purpose.presenter.test.js index 548fb395ac..ff5ca95346 100644 --- a/test/presenters/return-requirements/setup/purpose.presenter.test.js +++ b/test/presenters/return-requirements/setup/purpose.presenter.test.js @@ -47,7 +47,7 @@ describe('Return Requirements Setup - Purpose presenter', () => { const result = PurposePresenter.go(session, requirementIndex, licencePurposes) expect(result).to.equal({ - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/method', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/method', licenceId: '8b7f78ba-f3ad-4cb6-a058-78abc4d1383d', licenceRef: '01/ABC', purposes: [ @@ -71,7 +71,7 @@ describe('Return Requirements Setup - Purpose presenter', () => { it('returns a link back to the "check" page', () => { const result = PurposePresenter.go(session, requirementIndex, licencePurposes) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) @@ -86,7 +86,7 @@ describe('Return Requirements Setup - Purpose presenter', () => { it('returns a link back to the "check" page', () => { const result = PurposePresenter.go(session, requirementIndex, licencePurposes) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) }) @@ -95,7 +95,7 @@ describe('Return Requirements Setup - Purpose presenter', () => { it('returns a link back to the "method" page', () => { const result = PurposePresenter.go(session, requirementIndex, licencePurposes) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/method') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/method') }) }) }) diff --git a/test/presenters/return-requirements/setup/reason.presenter.test.js b/test/presenters/return-requirements/setup/reason.presenter.test.js index 370ffa8e66..dba54f7aae 100644 --- a/test/presenters/return-requirements/setup/reason.presenter.test.js +++ b/test/presenters/return-requirements/setup/reason.presenter.test.js @@ -36,7 +36,7 @@ describe('Return Requirements Setup - Reason presenter', () => { const result = ReasonPresenter.go(session) expect(result).to.equal({ - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/start-date', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/start-date', licenceRef: '01/ABC', reason: null, sessionId: '61e07498-f309-4829-96a9-72084a54996d' @@ -53,7 +53,7 @@ describe('Return Requirements Setup - Reason presenter', () => { it('returns a link back to the "check" page', () => { const result = ReasonPresenter.go(session) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) @@ -61,7 +61,7 @@ describe('Return Requirements Setup - Reason presenter', () => { it('returns a link back to the "start-date" page', () => { const result = ReasonPresenter.go(session) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/start-date') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/start-date') }) }) }) diff --git a/test/presenters/return-requirements/setup/remove.presenter.test.js b/test/presenters/return-requirements/setup/remove.presenter.test.js index 9b4334273f..ea6d10df11 100644 --- a/test/presenters/return-requirements/setup/remove.presenter.test.js +++ b/test/presenters/return-requirements/setup/remove.presenter.test.js @@ -59,7 +59,7 @@ describe('Return Requirements Setup - Remove presenter', () => { const result = RemovePresenter.go(session, requirementIndex) expect(result).to.equal({ - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check', licenceId: '8b7f78ba-f3ad-4cb6-a058-78abc4d1383d', licenceRef: '01/ABC', returnRequirement: 'Winter and all year monthly requirements for returns, Bore hole in rear field.', @@ -73,7 +73,7 @@ describe('Return Requirements Setup - Remove presenter', () => { it('returns a link back to the "setup" page', () => { const result = RemovePresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) diff --git a/test/presenters/return-requirements/setup/returns-cycle.presenter.test.js b/test/presenters/return-requirements/setup/returns-cycle.presenter.test.js index 6f1f326192..c075b074ca 100644 --- a/test/presenters/return-requirements/setup/returns-cycle.presenter.test.js +++ b/test/presenters/return-requirements/setup/returns-cycle.presenter.test.js @@ -39,7 +39,7 @@ describe('Return Requirements Setup - Returns Cycle presenter', () => { const result = ReturnsCyclePresenter.go(session, requirementIndex) expect(result).to.equal({ - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/abstraction-period/0', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/abstraction-period/0', licenceId: '8b7f78ba-f3ad-4cb6-a058-78abc4d1383d', licenceRef: '01/ABC', returnsCycle: null, @@ -57,7 +57,7 @@ describe('Return Requirements Setup - Returns Cycle presenter', () => { it('returns a link back to the "check" page', () => { const result = ReturnsCyclePresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) @@ -65,7 +65,7 @@ describe('Return Requirements Setup - Returns Cycle presenter', () => { it('returns a link back to the "abstraction-period" page', () => { const result = ReturnsCyclePresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/abstraction-period/0') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/abstraction-period/0') }) }) }) diff --git a/test/presenters/return-requirements/setup/site-description.presenter.test.js b/test/presenters/return-requirements/setup/site-description.presenter.test.js index e40f014f83..1308b32fd6 100644 --- a/test/presenters/return-requirements/setup/site-description.presenter.test.js +++ b/test/presenters/return-requirements/setup/site-description.presenter.test.js @@ -39,7 +39,7 @@ describe('Return Requirements Setup - Site Description presenter', () => { const result = SiteDescriptionPresenter.go(session, requirementIndex) expect(result).to.equal({ - backLink: '/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/returns-cycle/0', + backLink: '/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/returns-cycle/0', licenceId: '8b7f78ba-f3ad-4cb6-a058-78abc4d1383d', licenceRef: '01/ABC', sessionId: '61e07498-f309-4829-96a9-72084a54996d', @@ -57,7 +57,7 @@ describe('Return Requirements Setup - Site Description presenter', () => { it('returns a link back to the "check" page', () => { const result = SiteDescriptionPresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) @@ -65,7 +65,7 @@ describe('Return Requirements Setup - Site Description presenter', () => { it('returns a link back to the "returns-cycle" page', () => { const result = SiteDescriptionPresenter.go(session, requirementIndex) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/returns-cycle/0') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/returns-cycle/0') }) }) }) diff --git a/test/presenters/return-requirements/setup/start-date.presenter.test.js b/test/presenters/return-requirements/setup/start-date.presenter.test.js index 64df3bfbb7..34814f70d5 100644 --- a/test/presenters/return-requirements/setup/start-date.presenter.test.js +++ b/test/presenters/return-requirements/setup/start-date.presenter.test.js @@ -61,7 +61,7 @@ describe('Return Requirements Setup - Start Date presenter', () => { it('returns a link back to the "check" page', () => { const result = StartDatePresenter.go(session) - expect(result.backLink).to.equal('/system/return-requirements/61e07498-f309-4829-96a9-72084a54996d/check') + expect(result.backLink).to.equal('/system/return-requirements/setup/61e07498-f309-4829-96a9-72084a54996d/check') }) }) diff --git a/test/services/licences/view-licence-history.service.test.js b/test/services/licences/view-licence-history.service.test.js index f8f74f3e76..f0a0020328 100644 --- a/test/services/licences/view-licence-history.service.test.js +++ b/test/services/licences/view-licence-history.service.test.js @@ -66,7 +66,7 @@ describe('View Licence History service', () => { dateCreated: '5 April 2021', displayNote: true, notes: ['Test note'], - link: '/system/return-requirements/3f09ce0b-288c-4c0b-b519-7329fe70a6cc/view', + link: '/system/return-requirements/3f09ce0b-288c-4c0b-b519-7329fe70a6cc', reason: 'New licence', type: { index: 2, name: 'Return version' } }