Merge pull request #91 from DEFRA/DSFAAP-603

DSFAAP-603: update origin exit page content
DEFRA · Dec 19, 2024 · 6914043 · 6914043
2 parents 087d5b5 + 8e8405a
commit 6914043
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/src/server/origin/exit-page/controller.test.js b/src/server/origin/exit-page/controller.test.js
@@ -1,7 +1,13 @@
 import { createServer } from '~/src/server/index.js'
 import { statusCodes } from '~/src/server/common/constants/status-codes.js'
+import { parseDocument } from '../../common/test-helpers/dom.js'
 
 describe('#exitPageController', () => {
+  const pageTitleAndHeading =
+    'This service is not available for your movement type'
+  const govukTB204Link =
+    'https://www.gov.uk/government/publications/tb-restricted-cattle-application-for-movement-licence-in-england'
+
   /** @type {Server} */
   let server
 
@@ -15,16 +21,19 @@ describe('#exitPageController', () => {
   })
 
   test('Should provide expected response', async () => {
-    const { result, statusCode } = await server.inject({
+    const { payload, statusCode } = await server.inject({
       method: 'GET',
       url: '/exit-page'
     })
 
-    expect(result).toEqual(
-      expect.stringContaining(
-        'This service is not available for your movement type'
-      )
-    )
+    const document = parseDocument(payload)
+
+    expect(document.querySelector('h1')?.innerHTML).toEqual(pageTitleAndHeading)
+    expect(document.title).toBe(pageTitleAndHeading)
+
+    expect(
+      document.querySelector(`[href='${govukTB204Link}']`)?.innerHTML.trim()
+    ).toBe('submit the current application form on GOV.UK')
     expect(statusCode).toBe(statusCodes.ok)
   })
 })

diff --git a/src/server/origin/exit-page/index.njk b/src/server/origin/exit-page/index.njk
@@ -10,18 +10,14 @@
           This service is currently only available for movements off your farm
           or premises.
         </p>
-
-        <p>You need to complete and submit the current form.</p>
-
         <p>
+          You need to complete and
           <a
             data-testid="view-application-link"
             href="https://www.gov.uk/government/publications/tb-restricted-cattle-application-for-movement-licence-in-england"
           >
-            View the application form
-          </a>
-          on
-          <a data-testid="gov-uk-link" href="https://www.gov.uk/"> GOV.UK </a>
+            submit the current application form on GOV.UK </a
+          >.
         </p>
       </div>
     </div>

diff --git a/user-journey-tests/page-objects/origin/exitPage.js b/user-journey-tests/page-objects/origin/exitPage.js
@@ -15,20 +15,12 @@ class ExitPage extends Page {
     return $('[data-testid="view-application-link"]')
   }
 
-  get govUkLink() {
-    return $('[data-testid="gov-uk-link"]')
-  }
-
   async verifyViewApplicationLink() {
     await page.selectLinkAndVerifyTitle(
       this.viewApplicationLink,
       'TB restricted cattle: application for movement licence in England - GOV.UK'
     )
   }
-
-  async verifyGovUkLink() {
-    await page.selectLinkAndVerifyTitle(this.govUkLink, 'Welcome to GOV.UK')
-  }
 }
 
 export default new ExitPage()
diff --git a/user-journey-tests/specs/origin/exit.spec.js b/user-journey-tests/specs/origin/exit.spec.js
@@ -9,8 +9,4 @@ describe('Exit page test', () => {
   it('Should verify the view application link', async () => {
     await exitPage.verifyViewApplicationLink()
   })
-
-  it('Should verify the gov uk link', async () => {
-    await exitPage.verifyGovUkLink()
-  })
 })