@defra-fish/gafl-webapp-service 1.65.0-rc.0 → 1.65.0-rc.10

package/src/pages/recurring-payments/cancel/agreement-not-found/__tests__/route.spec.js

@@ -0,0 +1,129 @@
+import pageRoute from '../../../../../routes/page-route.js'
+import { CANCEL_RP_AGREEMENT_NOT_FOUND, CANCEL_RP_IDENTIFY } from '../../../../../uri.js'
+
+require('../route.js')
+// eslint-disable-next-line no-unused-vars
+const [[_v, _p, validator, completion, getData]] = pageRoute.mock.calls
+
+jest.mock('../../../../../routes/page-route.js')
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CANCEL_RP_IDENTIFY: { page: Symbol('cancel-rp-identify-page') },
+  CANCEL_RP_AGREEMENT_NOT_FOUND: { page: Symbol('cancel-rp-agreement-not-found-page'), uri: Symbol('cancel-rp-agreement-not-found-uri') }
+}))
+jest.mock('../../../../../processors/uri-helper.js')
+
+const getSampleRequest = (referenceNumber = 'RP12345678') => ({
+  cache: jest.fn(() => ({
+    helpers: {
+      page: {
+        getCurrentPermission: jest.fn(() => ({ payload: { referenceNumber } }))
+      }
+    }
+  }))
+})
+
+describe('pageRoute receives expected arguments', () => {
+  it('passes CANCEL_RP_AGREEMENT_NOT_FOUND.page as the view name', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        CANCEL_RP_AGREEMENT_NOT_FOUND.page,
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes CANCEL_RP_AGREEMENT_NOT_FOUND.uri as the path', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        CANCEL_RP_AGREEMENT_NOT_FOUND.uri,
+        expect.anything(),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function as the validator', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function),
+        expect.anything(),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function to generate redirect location on completion', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function),
+        expect.anything()
+      )
+    })
+  })
+
+  it('passes a function to get the page data', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.anything(),
+        expect.any(Function)
+      )
+    })
+  })
+})
+
+describe('getData', () => {
+  it('passes call charges link in list of urls', async () => {
+    expect(await getData(getSampleRequest())).toEqual(
+      expect.objectContaining({
+        links: expect.objectContaining({
+          callCharges: 'https://www.gov.uk/call-charges'
+        })
+      })
+    )
+  })
+
+  it('passes contact us email in list of urls', async () => {
+    expect(await getData(getSampleRequest())).toEqual(
+      expect.objectContaining({
+        links: expect.objectContaining({
+          contactUs: 'mailto:enquiries@environment-agency.gov.uk'
+        })
+      })
+    )
+  })
+
+  it('requests page data from CANCEL_RP_IDENTIFY page', async () => {
+    const request = getSampleRequest()
+    await getData(request)
+    const [{ value: pageCache }] = request.cache.mock.results
+    expect(pageCache.helpers.page.getCurrentPermission).toHaveBeenCalledWith(CANCEL_RP_IDENTIFY.page)
+  })
+
+  it('passes reference number from CANCEL_RP_IDENTIFY page data', async () => {
+    const referenceNumber = 'RP87654321'
+    expect(await getData(getSampleRequest(referenceNumber))).toEqual(
+      expect.objectContaining({
+        referenceNumber
+      })
+    )
+  })
+})

package/src/pages/recurring-payments/cancel/agreement-not-found/cancel-rp-agreement-not-found.njk

@@ -0,0 +1,15 @@
+{% extends "layout.njk" %}
+{% extends "standard-form.njk" %}
+
+{% set title = mssgs.rp_cancel_no_agreement_found_title %}
+
+{% block content %}
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <h1 class="govuk-heading-l">{{ mssgs.rp_cancel_no_agreement_found_heading }}</h1>
+        <p class="govuk-body">{{ mssgs.rp_cancel_no_agreement_found_licence_will_not_renew_1 }}{{ data.referenceNumber }}{{ mssgs.rp_cancel_no_agreement_found_licence_will_not_renew_2 }}</p>
+        <p class="govuk-body"><a class="govuk-link" href="{{ backRef }}">{{ mssgs.rp_cancel_no_agreement_found_go_back_link }}</a>{{ mssgs.rp_cancel_no_agreement_found_go_back_instruction }}</p>
+        <p class="govuk-body">{{ mssgs.rp_cancel_no_agreement_found_need_help_1 }}<a class="govuk-link" href="mailto:{{ data.links.contactUs }}">{{ mssgs.rp_cancel_no_agreement_found_need_help_email }}</a>{{ mssgs.rp_cancel_no_agreement_found_need_help_2 }}<a class="govuk-link" href="{{ data.links.callCharges }}" target="_blank">{{ mssgs.rp_cancel_no_agreement_found_call_charges_link }}</a></p>
+    </div>
+</div>
+{% endblock %}

package/src/pages/recurring-payments/cancel/agreement-not-found/route.js

@@ -0,0 +1,23 @@
+import pageRoute from '../../../../routes/page-route.js'
+import { CANCEL_RP_AGREEMENT_NOT_FOUND, CANCEL_RP_IDENTIFY } from '../../../../uri.js'
+
+const getData = async request => {
+  const {
+    payload: { referenceNumber }
+  } = await request.cache().helpers.page.getCurrentPermission(CANCEL_RP_IDENTIFY.page)
+  return {
+    referenceNumber,
+    links: {
+      callCharges: 'https://www.gov.uk/call-charges',
+      contactUs: 'mailto:enquiries@environment-agency.gov.uk'
+    }
+  }
+}
+
+export default pageRoute(
+  CANCEL_RP_AGREEMENT_NOT_FOUND.page,
+  CANCEL_RP_AGREEMENT_NOT_FOUND.uri,
+  () => {},
+  () => {},
+  getData
+)

package/src/pages/recurring-payments/cancel/{confirm/__tests__/route.test.js → already-cancelled/__tests__/route.spec.js}

@@ -1,25 +1,37 @@
 import pageRoute from '../../../../../routes/page-route.js'
-import { CANCEL_RP_CONFIRM, CANCEL_RP_COMPLETE } from '../../../../../uri.js'
-import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+import { CANCEL_RP_ALREADY_CANCELLED } from '../../../../../uri.js'
 
 require('../route.js')
+
 // eslint-disable-next-line no-unused-vars
-const [[_v, _p, validator, completion, getData]] = pageRoute.mock.calls
+const getData = pageRoute.mock.calls[0][4]
 
-jest.mock('../../../../../routes/page-route.js')
+jest.mock('../../../../../routes/page-route.js', () => jest.fn())
 jest.mock('../../../../../uri.js', () => ({
   ...jest.requireActual('../../../../../uri.js'),
-  CANCEL_RP_CONFIRM: { page: Symbol('cancel-rp-confirm-page'), uri: Symbol('cancel-rp-confirm-uri') },
-  CANCEL_RP_COMPLETE: { uri: Symbol('cancel-rp-complete-uri') }
+  CANCEL_RP_ALREADY_CANCELLED: {
+    page: Symbol('cancel-rp-already-cancelled page'),
+    uri: Symbol('cancel-rp-already-cancelled uri')
+  }
 }))
 jest.mock('../../../../../processors/uri-helper.js')
 
+const getSampleRequest = referenceNumber => ({
+  cache: jest.fn(() => ({
+    helpers: {
+      page: {
+        getCurrentPermission: jest.fn(() => ({ payload: { referenceNumber, endDate: '2025:10:03:03:33:33' } }))
+      }
+    }
+  }))
+})
+
 describe('pageRoute receives expected arguments', () => {
-  it('passes CANCEL_RP_CONFIRM.page as the view name', () => {
+  it('passes CANCEL_RP_ALREADY_CANCELLED.page as the view name', () => {
     jest.isolateModules(() => {
       require('../route.js')
       expect(pageRoute).toHaveBeenCalledWith(
-        CANCEL_RP_CONFIRM.page,
+        CANCEL_RP_ALREADY_CANCELLED.page,
         expect.anything(),
         expect.anything(),
         expect.anything(),
@@ -28,12 +40,12 @@ describe('pageRoute receives expected arguments', () => {
     })
   })
 
-  it('passes CANCEL_RP_CONFIRM.uri as the path', () => {
+  it('passes CANCEL_RP_ALREADY_CANCELLED.uri as the path', () => {
     jest.isolateModules(() => {
       require('../route.js')
       expect(pageRoute).toHaveBeenCalledWith(
         expect.anything(),
-        CANCEL_RP_CONFIRM.uri,
+        CANCEL_RP_ALREADY_CANCELLED.uri,
         expect.anything(),
         expect.anything(),
         expect.anything()
@@ -67,7 +79,7 @@ describe('pageRoute receives expected arguments', () => {
     })
   })
 
-  it('passes a function to get the page data', () => {
+  it('passes getData to pageRoute', () => {
     jest.isolateModules(() => {
       require('../route.js')
       expect(pageRoute).toHaveBeenCalledWith(
@@ -81,26 +93,23 @@ describe('pageRoute receives expected arguments', () => {
   })
 })
 
-describe('completion function', () => {
-  beforeEach(jest.clearAllMocks)
-
-  it('calls addLanguageCodeToUri with request object', () => {
-    const sampleRequest = Symbol('sample request')
-    completion(sampleRequest)
-    expect(addLanguageCodeToUri).toHaveBeenCalledWith(sampleRequest, expect.anything())
+describe('getData', () => {
+  it('returns reference number from payload', async () => {
+    const referenceNumber = 'RP0310'
+    expect(await getData(getSampleRequest(referenceNumber))).toEqual(
+      expect.objectContaining({
+        referenceNumber
+      })
+    )
   })
 
-  it('calls addLanguageCodeToUri with CANCEL_RP_AUTHENTICATE uri', () => {
-    completion({})
-    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_COMPLETE.uri)
-  })
-
-  it('returns the value of addLanguageCodeToUri', () => {
-    const expectedCompletionRedirect = Symbol('expected-completion-redirect')
-    addLanguageCodeToUri.mockReturnValueOnce(expectedCompletionRedirect)
-
-    const completionRedirect = completion({})
-
-    expect(completionRedirect).toBe(expectedCompletionRedirect)
+  it('transforms end date to display format', async () => {
+    const endDate = '2025-10-03T03:33:33.000Z'
+    const request = getSampleRequest()
+    request.cache().helpers.page.getCurrentPermission.mockResolvedValueOnce({
+      payload: { referenceNumber: 'RP0310', endDate }
+    })
+    const data = await getData(request)
+    expect(data.endDate).toEqual('3 October 2025')
   })
 })

package/src/pages/recurring-payments/cancel/already-cancelled/already-cancelled.njk

@@ -0,0 +1,28 @@
+{% extends "layout.njk" %}
+{% from "page-title.njk" import pageTitle %}
+
+{% set title = mssgs.rp_cancel_already_cancelled_title %}
+{% block pageTitle %}{{ pageTitle(title, mssgs) }}{% endblock %}
+
+{% block content %}
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <h1 class="govuk-heading-l">{{ mssgs.rp_licence_already_cancelled_heading }}</h1>
+    <p class="govuk-body">
+      {{ mssgs.rp_licence_already_cancelled_body_1 }}{{ data.referenceNumber }}{{ mssgs.rp_licence_already_cancelled_body_1_1 }}{{ data.endDate }}{{ mssgs.rp_licence_already_cancelled_body_1_2 }}
+      <a href="/" class="govuk-link" target="_blank" rel="noopener"> {{ mssgs.rp_licence_already_cancelled_body_link }}</a>{{ mssgs.full_stop }}
+    </p>
+    <p class="govuk-body">
+      {{ mssgs.rp_licence_already_cancelled_body_2_1 }}
+      <a href="mailto:enquiries@environment-agency.gov.uk"> {{ mssgs.rp_licence_already_cancelled_body_ea_link }}</a>
+      {{ mssgs.rp_licence_already_cancelled_body_2_2 }}
+      <a href="https://www.gov.uk/call-charges" target="_blank" rel="noopener"> {{ mssgs.licence_not_found_body_call_charges_link }}</a>{{ mssgs.full_stop }}
+    </p>
+    <p class="govuk-body">
+      <a class="govuk-link" href="/buy/cancel-recurring-payment/identify"> {{ mssgs.rp_licence_already_cancelled_body_3_1 }}
+        </a>{{ mssgs.rp_licence_already_cancelled_body_3_2 }}
+    </p>
+    
+  </div>
+</div>
+{% endblock %}

package/src/pages/recurring-payments/cancel/already-cancelled/route.js

@@ -0,0 +1,25 @@
+import pageRoute from '../../../../routes/page-route.js'
+import { SERVICE_LOCAL_TIME } from '@defra-fish/business-rules-lib'
+import { CANCEL_RP_ALREADY_CANCELLED, CANCEL_RP_IDENTIFY } from '../../../../uri.js'
+import { cacheDateFormat, dateDisplayFormat } from '../../../../processors/date-and-time-display.js'
+import moment from 'moment-timezone'
+
+const getData = async request => {
+  const {
+    payload: { referenceNumber, endDate }
+  } = await request.cache().helpers.page.getCurrentPermission(CANCEL_RP_IDENTIFY.page)
+  const endDateString = moment(endDate, cacheDateFormat).tz(SERVICE_LOCAL_TIME).format(dateDisplayFormat)
+
+  return {
+    referenceNumber,
+    endDate: endDateString
+  }
+}
+
+export default pageRoute(
+  CANCEL_RP_ALREADY_CANCELLED.page,
+  CANCEL_RP_ALREADY_CANCELLED.uri,
+  () => {},
+  () => {},
+  getData
+)

package/src/pages/recurring-payments/cancel/confirm/__tests__/route.spec.js

@@ -0,0 +1,122 @@
+import pageRoute from '../../../../../routes/page-route.js'
+import { CANCEL_RP_CONFIRM, CANCEL_RP_COMPLETE, CANCEL_RP_IDENTIFY } from '../../../../../uri.js'
+import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+import moment from 'moment-timezone'
+import { dateDisplayFormat } from '../../../../../processors/date-and-time-display.js'
+
+require('../route.js')
+
+// eslint-disable-next-line no-unused-vars
+const [[_v, _p, validator, completion, getData]] = pageRoute.mock.calls
+
+jest.mock('../../../../../routes/page-route.js')
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CANCEL_RP_CONFIRM: { page: Symbol('cancel-rp-confirm-page'), uri: Symbol('cancel-rp-confirm-uri') },
+  CANCEL_RP_COMPLETE: { uri: Symbol('cancel-rp-complete-uri') },
+  CANCEL_RP_IDENTIFY: { uri: Symbol('cancel-rp-identify-uri') }
+}))
+jest.mock('../../../../../processors/uri-helper.js')
+jest.mock('moment-timezone')
+jest.mock('../../../../../processors/date-and-time-display.js', () => ({
+  cacheDateFormat: Symbol('cache date format'),
+  dateDisplayFormat: Symbol('date display format')
+}))
+
+describe('pageRoute receives expected arguments', () => {
+  it('passes expected arguments to pageRoute', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        CANCEL_RP_CONFIRM.page,
+        CANCEL_RP_CONFIRM.uri,
+        expect.any(Function),
+        expect.any(Function),
+        expect.any(Function)
+      )
+    })
+  })
+})
+
+describe('completion function', () => {
+  beforeEach(jest.clearAllMocks)
+
+  it('calls addLanguageCodeToUri with request object', () => {
+    const sampleRequest = Symbol('sample request')
+    completion(sampleRequest)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(sampleRequest, expect.anything())
+  })
+
+  it('calls addLanguageCodeToUri with CANCEL_RP_COMPLETE uri', () => {
+    completion({})
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_COMPLETE.uri)
+  })
+
+  it('returns the value of addLanguageCodeToUri', () => {
+    const expecetdUri = Symbol('cancel-rp-complete-uri')
+    addLanguageCodeToUri.mockReturnValueOnce(expecetdUri)
+
+    const completionRedirect = completion({})
+
+    expect(completionRedirect).toBe(expecetdUri)
+  })
+})
+
+describe('getData function', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    moment.mockReturnValue({ format: jest.fn(() => '18th November, 2025') })
+  })
+
+  const mockRequest = () => {
+    const getCurrentPermission = jest.fn(() => ({ permission: { endDate: '2025-02-15' } }))
+
+    return {
+      locale: 'en',
+      cache: () => ({
+        helpers: {
+          transaction: {
+            getCurrentPermission
+          }
+        }
+      })
+    }
+  }
+
+  it('calls addLanguageCodeToUri with request object', async () => {
+    const request = mockRequest()
+    await getData(request)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(request, expect.anything())
+  })
+
+  it('calls addLanguageCodeToUri with CANCEL_RP_IDENTIFY uri', async () => {
+    const request = mockRequest()
+    await getData(request)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_IDENTIFY.uri)
+  })
+
+  it('cancelRpIdentify uri is equal to return of addLanguageCodeToUri for CANCEL_RP_IDENTIFY page', async () => {
+    const expectedUri = Symbol('expected-cancel-rp-identify-uri')
+    addLanguageCodeToUri.mockReturnValueOnce(expectedUri)
+
+    const data = await getData(mockRequest())
+
+    expect(data.uri).toEqual({
+      cancelRpIdentify: expectedUri
+    })
+  })
+
+  it('returns licenceExpiry in correct format', async () => {
+    const mockFormat = jest.fn().mockReturnValue('19th November, 2025')
+    moment.mockReturnValue({ format: mockFormat })
+
+    const data = await getData(mockRequest())
+
+    expect(data.licenceExpiry).toEqual('19th November, 2025')
+  })
+
+  it('uses expected date format', async () => {
+    await getData(mockRequest())
+    expect(moment.mock.results[0].value.format).toHaveBeenCalledWith(dateDisplayFormat)
+  })
+})

package/src/pages/recurring-payments/cancel/confirm/cancel-rp-confirm.njk

@@ -2,23 +2,44 @@
 
 {% from "button/macro.njk" import govukButton %}
 {% from "page-title.njk" import pageTitle %}
+{% from "fieldset/macro.njk" import govukFieldset %}
 
 {% set title = mssgs.rp_cancel_confirm_title %}
 {% block pageTitle %}{{ pageTitle(title, error, mssgs) }}{% endblock %}
 
 {% block content %}
-<div class="govuk-grid-row">
+  {% set legendHtml %}
+    <span class="govuk-caption-l">{{ mssgs.cancel_rp_identify_caption }}</span>
+    {{ title }}
+  {% endset %}
+
+  {% call govukFieldset({
+    legend: {
+      html: legendHtml,
+      classes: "govuk-fieldset__legend--l govuk-!-margin-bottom-3",
+      isPageHeading: true
+    }
+  }) %}
+
+  <p class="govuk-body-m">{{ mssgs.rp_cancel_confirm_body }}{{ data.licenceExpiry }}</p>
+
+  <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
         <form method="post" class="govuk-!-margin-bottom-6">
-          {{ govukButton({
-            attributes: { id: 'continue' },
-            preventDoubleClick: true,
-            name: "continue",
-            text: mssgs.continue,
-            classes: "govuk-!-margin-top-1"
-          }) }}
-          {{ csrf() }}
+          <div class="govuk-button-group">
+            {{ govukButton({
+              attributes: { id: 'continue' },
+              preventDoubleClick: true,
+              name: "continue",
+              text: mssgs.rp_cancel_confirm_accept,
+              classes: "govuk-!-margin-top-1"
+            }) }}
+            {{ csrf() }}
+            <p class="govuk-body no-print"><a class="govuk-link" href="{{ data.uri.cancelRpIdentify }}">{{ mssgs.rp_cancel_confirm_reject }}</a></p>
+          </div>
         </form>
     </div>
-</div>
+  </div>
+
+  {% endcall %}
 {% endblock %}

package/src/pages/recurring-payments/cancel/confirm/route.js

@@ -1,11 +1,24 @@
 import pageRoute from '../../../../routes/page-route.js'
-import { CANCEL_RP_CONFIRM, CANCEL_RP_COMPLETE } from '../../../../uri.js'
+import { CANCEL_RP_COMPLETE, CANCEL_RP_CONFIRM, CANCEL_RP_IDENTIFY } from '../../../../uri.js'
 import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
+import { cacheDateFormat, dateDisplayFormat } from '../../../../processors/date-and-time-display.js'
+import moment from 'moment-timezone'
+
+const getData = async request => {
+  const { permission } = await request.cache().helpers.transaction.getCurrentPermission()
+
+  return {
+    licenceExpiry: moment(permission.endDate, cacheDateFormat, request.locale).format(dateDisplayFormat),
+    uri: {
+      cancelRpIdentify: addLanguageCodeToUri(request, CANCEL_RP_IDENTIFY.uri)
+    }
+  }
+}
 
 export default pageRoute(
   CANCEL_RP_CONFIRM.page,
   CANCEL_RP_CONFIRM.uri,
   () => {},
   request => addLanguageCodeToUri(request, CANCEL_RP_COMPLETE.uri),
-  () => {}
+  getData
 )

package/src/pages/recurring-payments/cancel/details/__tests__/route.spec.js

@@ -2,6 +2,8 @@ import pageRoute from '../../../../../routes/page-route.js'
 import { CANCEL_RP_DETAILS, CANCEL_RP_CONFIRM } from '../../../../../uri.js'
 import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
 import { getData } from '../route.js'
+import moment from 'moment-timezone'
+import { cacheDateFormat, dateDisplayFormat } from '../../../../../processors/date-and-time-display.js'
 
 jest.mock('../../../../../routes/page-route.js')
 jest.mock('../../../../../uri.js', () => ({
@@ -10,6 +12,15 @@ jest.mock('../../../../../uri.js', () => ({
   CANCEL_RP_CONFIRM: { uri: Symbol('cancel-rp-confirm-uri') }
 }))
 jest.mock('../../../../../processors/uri-helper.js')
+jest.mock('moment-timezone', () =>
+  jest.fn(() => ({
+    format: jest.fn()
+  }))
+)
+jest.mock('../../../../../processors/date-and-time-display.js', () => ({
+  cacheDateFormat: Symbol('cache-date-format'),
+  dateDisplayFormat: Symbol('date-display-format')
+}))
 
 describe('route', () => {
   beforeEach(jest.clearAllMocks)
@@ -82,7 +93,7 @@ describe('route', () => {
       referenceNumber: 'abc123'
     },
     recurringPayment: {
-      lastDigitsCardNumbers: 1234
+      lastDigitsCardNumbers: '1234'
     }
   })
 
@@ -96,7 +107,8 @@ describe('route', () => {
     }),
     i18n: {
       getCatalog: () => catalog
-    }
+    },
+    locale: Symbol('en-GB')
   })
 
   describe('getData', () => {
@@ -115,17 +127,67 @@ describe('route', () => {
 
     it('returns summaryTable with expected data', async () => {
       const mssgs = getSampleCatalog()
-      const mockRequest = createMockRequest({ catalog: mssgs })
+      const sampleData = {
+        permission: {
+          licensee: {
+            firstName: 'Brenin',
+            lastName: 'Pysgotwr'
+          },
+          permit: {
+            description: 'Wellies and old shopping trollies'
+          },
+          endDate: '21-03-2026',
+          referenceNumber: 'aaa-111-bbb-222'
+        },
+        recurringPayment: {
+          lastDigitsCardNumbers: '9999'
+        }
+      }
+      const sampleFormattedDate = Symbol('formatted-end-date')
+      const mockRequest = createMockRequest({ catalog: mssgs, currentPermission: sampleData })
+      moment.mockReturnValueOnce({
+        format: () => sampleFormattedDate
+      })
 
       const result = await getData(mockRequest)
 
       expect(result.summaryTable).toEqual([
-        { key: { text: mssgs.rp_cancel_details_licence_holder }, value: { text: 'John Smith' } },
-        { key: { text: mssgs.rp_cancel_details_licence_type }, value: { text: 'Salmon and sea trout' } },
-        { key: { text: mssgs.rp_cancel_details_payment_card }, value: { text: 1234 } },
-        { key: { text: mssgs.rp_cancel_details_last_purchased }, value: { text: 'abc123' } },
-        { key: { text: mssgs.rp_cancel_details_licence_valid_until }, value: { text: '01-01-2026' } }
+        {
+          key: { text: mssgs.rp_cancel_details_licence_holder },
+          value: { text: `${sampleData.permission.licensee.firstName} ${sampleData.permission.licensee.lastName}` }
+        },
+        { key: { text: mssgs.rp_cancel_details_licence_type }, value: { text: sampleData.permission.permit.description } },
+        {
+          key: { text: mssgs.rp_cancel_details_payment_card },
+          value: { text: `**** **** **** ${sampleData.recurringPayment.lastDigitsCardNumbers}` }
+        },
+        { key: { text: mssgs.rp_cancel_details_last_purchased }, value: { text: sampleData.permission.referenceNumber } },
+        { key: { text: mssgs.rp_cancel_details_licence_valid_until }, value: { text: sampleFormattedDate } }
       ])
     })
+
+    it('passes cache date format and request locale to moment', async () => {
+      const data = getSamplePermission()
+      data.permission.endDate = Symbol('end-date')
+      const mockRequest = createMockRequest({ currentPermission: data })
+
+      await getData(mockRequest)
+
+      expect(moment).toHaveBeenCalledWith(data.permission.endDate, cacheDateFormat, mockRequest.locale)
+    })
+
+    it('requests correct date format', async () => {
+      const data = getSamplePermission()
+      data.permission.endDate = Symbol('end-date')
+      const mockRequest = createMockRequest({ currentPermission: data })
+      const format = jest.fn()
+      moment.mockReturnValueOnce({
+        format
+      })
+
+      await getData(mockRequest)
+
+      expect(format).toHaveBeenCalledWith(dateDisplayFormat)
+    })
   })
 })