Fix mark for supp billing page attributes (#1496)

DEFRA/water-abstraction-acceptance-tests#144 As part of the work for the acceptance tests for supplementary billing flags, this PR introduces the necessary data-test attributes on the view page for the "Mark for Supplementary Billing" feature.
DEFRA · Nov 19, 2024 · ee3639c · ee3639c
1 parent 586b991
commit ee3639c
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 24 deletions.
diff --git a/app/controllers/licences.controller.js b/app/controllers/licences.controller.js
@@ -28,7 +28,7 @@ async function markedForSupplementaryBilling (request, h) {
   const pageData = await MarkedForSupplementaryBillingService.go(licenceId)
 
   return h.view('licences/marked-for-supplementary-billing.njk', {
-    pageTitle: 'You’ve marked this licence for the next supplementary bill run',
+    pageTitle: "You've marked this licence for the next supplementary bill run",
     activeNavBar: 'search',
     ...pageData
   })

diff --git a/app/presenters/licences/supplementary/mark-for-supplementary-billing.presenter.js b/app/presenters/licences/supplementary/mark-for-supplementary-billing.presenter.js
@@ -57,9 +57,18 @@ function _yearsToDisplay () {
     const year = currentFinancialYearEnd - i
 
     if (year > LAST_PRE_SROC_FINANCIAL_YEAR_END) {
-      lastSixFinancialYears.push({ text: formatFinancialYear(year), value: year })
+      lastSixFinancialYears.push({
+        text: formatFinancialYear(year),
+        value: year,
+        attributes: { 'data-test': `sroc-years-${year}` }
+      })
     } else {
-      lastSixFinancialYears.push({ text: 'Before 2022', value: 'preSroc', hint: { text: 'Old charge scheme' } })
+      lastSixFinancialYears.push({
+        text: 'Before 2022',
+        value: 'preSroc',
+        hint: { text: 'Old charge scheme' },
+        attributes: { 'data-test': 'pre-sroc-years' }
+      })
 
       break
     }

diff --git a/test/controllers/licences.controller.test.js b/test/controllers/licences.controller.test.js
@@ -538,7 +538,7 @@ describe('Licences controller', () => {
           const response = await server.inject(options)
 
           expect(response.statusCode).to.equal(200)
-          expect(response.payload).to.contain('You’ve marked this licence for the next supplementary bill run')
+          expect(response.payload).to.contain('You&#39;ve marked this licence for the next supplementary bill run')
         })
       })
     })

diff --git a/test/presenters/licences/supplementary/mark-for-supplementary-billing.presenter.test.js b/test/presenters/licences/supplementary/mark-for-supplementary-billing.presenter.test.js
@@ -50,9 +50,9 @@ describe('Mark For Supplementary Billing presenter', () => {
           licenceId: 'test-id',
           licenceRef: '01/Test',
           financialYears: [
-            { text: '2023 to 2024', value: 2024 },
-            { text: '2022 to 2023', value: 2023 },
-            { text: 'Before 2022', value: 'preSroc', hint: { text: 'Old charge scheme' } }
+            { text: '2023 to 2024', value: 2024, attributes: { 'data-test': 'sroc-years-2024' } },
+            { text: '2022 to 2023', value: 2023, attributes: { 'data-test': 'sroc-years-2023' } },
+            { text: 'Before 2022', value: 'preSroc', hint: { text: 'Old charge scheme' }, attributes: { 'data-test': 'pre-sroc-years' } }
           ]
         })
       })
@@ -75,10 +75,15 @@ describe('Mark For Supplementary Billing presenter', () => {
           licenceId: 'test-id',
           licenceRef: '01/Test',
           financialYears: [
-            { text: '2024 to 2025', value: 2025 },
-            { text: '2023 to 2024', value: 2024 },
-            { text: '2022 to 2023', value: 2023 },
-            { text: 'Before 2022', value: 'preSroc', hint: { text: 'Old charge scheme' } }
+            { text: '2024 to 2025', value: 2025, attributes: { 'data-test': 'sroc-years-2025' } },
+            { text: '2023 to 2024', value: 2024, attributes: { 'data-test': 'sroc-years-2024' } },
+            { text: '2022 to 2023', value: 2023, attributes: { 'data-test': 'sroc-years-2023' } },
+            {
+              text: 'Before 2022',
+              value: 'preSroc',
+              hint: { text: 'Old charge scheme' },
+              attributes: { 'data-test': 'pre-sroc-years' }
+            }
           ]
         })
       })
@@ -101,12 +106,12 @@ describe('Mark For Supplementary Billing presenter', () => {
           licenceId: 'test-id',
           licenceRef: '01/Test',
           financialYears: [
-            { text: '2027 to 2028', value: 2028 },
-            { text: '2026 to 2027', value: 2027 },
-            { text: '2025 to 2026', value: 2026 },
-            { text: '2024 to 2025', value: 2025 },
-            { text: '2023 to 2024', value: 2024 },
-            { text: '2022 to 2023', value: 2023 }
+            { text: '2027 to 2028', value: 2028, attributes: { 'data-test': 'sroc-years-2028' } },
+            { text: '2026 to 2027', value: 2027, attributes: { 'data-test': 'sroc-years-2027' } },
+            { text: '2025 to 2026', value: 2026, attributes: { 'data-test': 'sroc-years-2026' } },
+            { text: '2024 to 2025', value: 2025, attributes: { 'data-test': 'sroc-years-2025' } },
+            { text: '2023 to 2024', value: 2024, attributes: { 'data-test': 'sroc-years-2024' } },
+            { text: '2022 to 2023', value: 2023, attributes: { 'data-test': 'sroc-years-2023' } }
           ]
         })
       })

diff --git a/test/services/licences/supplementary/mark-for-supplementary-billing.service.test.js b/test/services/licences/supplementary/mark-for-supplementary-billing.service.test.js
@@ -44,10 +44,15 @@ describe('Mark For Supplementary Billing Service', () => {
       expect(result.licenceId).to.equal(licence.id)
       expect(result.licenceRef).to.equal(licence.licenceRef)
       expect(result.financialYears).to.equal([
-        { text: '2024 to 2025', value: 2025 },
-        { text: '2023 to 2024', value: 2024 },
-        { text: '2022 to 2023', value: 2023 },
-        { text: 'Before 2022', value: 'preSroc', hint: { text: 'Old charge scheme' } }
+        { text: '2024 to 2025', value: 2025, attributes: { 'data-test': 'sroc-years-2025' } },
+        { text: '2023 to 2024', value: 2024, attributes: { 'data-test': 'sroc-years-2024' } },
+        { text: '2022 to 2023', value: 2023, attributes: { 'data-test': 'sroc-years-2023' } },
+        {
+          text: 'Before 2022',
+          value: 'preSroc',
+          hint: { text: 'Old charge scheme' },
+          attributes: { 'data-test': 'pre-sroc-years' }
+        }
       ])
     })
   })

diff --git a/test/services/licences/supplementary/submit-mark-for-supplementary-billing.service.test.js b/test/services/licences/supplementary/submit-mark-for-supplementary-billing.service.test.js
@@ -155,9 +155,14 @@ describe('Submit Mark For Supplementary Billing Service', () => {
             licenceId: licence.id,
             licenceRef: licence.licenceRef,
             financialYears: [
-              { text: '2023 to 2024', value: 2024 },
-              { text: '2022 to 2023', value: 2023 },
-              { text: 'Before 2022', value: 'preSroc', hint: { text: 'Old charge scheme' } }
+              { text: '2023 to 2024', value: 2024, attributes: { 'data-test': 'sroc-years-2024' } },
+              { text: '2022 to 2023', value: 2023, attributes: { 'data-test': 'sroc-years-2023' } },
+              {
+                text: 'Before 2022',
+                value: 'preSroc',
+                hint: { text: 'Old charge scheme' },
+                attributes: { 'data-test': 'pre-sroc-years' }
+              }
             ]
           })
         })