Fix more missed links

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' }
  }

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)

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'
  }
  ],

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')
  })
  })
  })

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,15 +89,15 @@ 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')
  })
  })
 
  describe('when the user has come from somewhere else', () => {
  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')
  })
  })
  })

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`)
  })
  })
 

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,15 +79,15 @@ 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')
  })
  })
 
  describe('when the user has come from somewhere else', () => {
  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')
  })
  })
  })

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',

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,15 +57,15 @@ 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')
  })
  })
 
  describe('when the user has come from somewhere else', () => {
  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')
  })
  })
  })

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,15 +57,15 @@ 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')
  })
  })
 
  describe('when the user has come from somewhere else', () => {
  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')
  })
  })
  })

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')
  })
  })
 

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,15 +53,15 @@ 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')
  })
  })
 
  describe('when the user has come from somewhere else', () => {
  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')
  })
  })
  })

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')
  })
  })
 

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,15 +73,15 @@ 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')
  })
  })
 
  describe('when the user has come from somewhere else', () => {
  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')
  })
  })
  })

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')
  })
  })
  })

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,15 +53,15 @@ 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')
  })
  })
 
  describe('when the user has come from somewhere else', () => {
  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')
  })
  })
  })