@defra/lis-infra-ui-services 0.23.0 → 0.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/lis-infra-ui-services",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "description": "UI-Services shared definitions for the livestock taxonomy topology.",
   "main": "src/index.js",
   "repository": {

package/src/errors/index.js

@@ -58,10 +58,5 @@ export function catchAll(request, h) {
     return h.continue
   }
   const { view, pageTitle } = errorPageFor(statusCode)
-  const developmentMessage =
-    process.env.NODE_ENV === 'development'
-      ? (response?.message ?? response?.source?.message)
-      : undefined
-
-  return h.view(view, { pageTitle, developmentMessage }).code(statusCode)
+  return h.view(view, { pageTitle }).code(statusCode)
 }

package/src/errors/index.test.js

@@ -83,10 +83,7 @@ test.each([
     catchAll(request, toolkit)
 
     // Assert
-    assert.deepEqual(toolkit.view.mock.calls[0], [
-      view,
-      { pageTitle, developmentMessage: undefined }
-    ])
+    assert.deepEqual(toolkit.view.mock.calls[0], [view, { pageTitle }])
     assert.deepEqual(toolkit.code.mock.calls[0], [statusCode])
   }
 )
@@ -103,8 +100,7 @@ test('catchAll logs server errors and renders the problem with the service page'
   assert.deepEqual(toolkit.view.mock.calls[0], [
     'error/problem-with-service',
     {
-      pageTitle: 'Sorry, there is a problem with the service',
-      developmentMessage: undefined
+      pageTitle: 'Sorry, there is a problem with the service'
     }
   ])
   assert.deepEqual(toolkit.code.mock.calls[0], [
@@ -143,43 +139,12 @@ test('catchAll prefers a client-attached statusCode over a boomified 500', () =>
   // Assert
   assert.deepEqual(toolkit.view.mock.calls[0], [
     'error/page-not-found',
-    { pageTitle: 'Page not found', developmentMessage: undefined }
+    { pageTitle: 'Page not found' }
   ])
   assert.deepEqual(toolkit.code.mock.calls[0], [statusCodes.notFound])
   assert.equal(logger.error.mock.calls.length, 0)
 })
 
-test("catchAll passes the error's own message to the page in development", () => {
-  // Arrange
-  vi.stubEnv('NODE_ENV', 'development')
-  const request = createBoomRequest(statusCodes.internalServerError)
-  request.response.message = 'Upstream timed out'
-  const toolkit = createToolkit()
-
-  // Act
-  catchAll(request, toolkit)
-
-  // Assert
-  assert.equal(
-    toolkit.view.mock.calls[0][1].developmentMessage,
-    'Upstream timed out'
-  )
-})
-
-test("catchAll leaves out the error's own message outside development", () => {
-  // Arrange
-  vi.stubEnv('NODE_ENV', 'production')
-  const request = createBoomRequest(statusCodes.internalServerError)
-  request.response.message = 'Upstream timed out'
-  const toolkit = createToolkit()
-
-  // Act
-  catchAll(request, toolkit)
-
-  // Assert
-  assert.equal(toolkit.view.mock.calls[0][1].developmentMessage, undefined)
-})
-
 test('catchAll does not log the 503 the maintenance plugin answered with', () => {
   // Arrange
   const toolkit = createToolkit()

package/src/nunjucks/routes/error/error-pages.test.js

@@ -160,35 +160,4 @@ describe('error pages', () => {
       '<a class="govuk-link" href="https://example.com/contact">British Cattle Movement Service (BCMS)</a>'
     )
   })
-
-  test('service unavailable says later when no return time is given', () => {
-    // Arrange
-    const context = { pageTitle: 'Sorry, the service is unavailable' }
-
-    // Act
-    const html = render('error/service-unavailable.njk', context)
-
-    // Assert
-    expect(textOf(html)).toContain('You will be able to use the service later.')
-  })
-
-  test.each([
-    'error/page-not-found.njk',
-    'error/not-authorised.njk',
-    'error/problem-with-service.njk',
-    'error/service-unavailable.njk'
-  ])('%s shows the development message only when one is given', (view) => {
-    // Arrange
-    const withMessage = { developmentMessage: 'Upstream timed out' }
-
-    // Act
-    const htmlWithMessage = render(view, withMessage)
-    const htmlWithoutMessage = render(view)
-
-    // Assert
-    expect(htmlWithMessage).toContain(
-      '<p class="govuk-body">Upstream timed out</p>'
-    )
-    expect(htmlWithoutMessage).not.toContain('Upstream timed out')
-  })
 })

package/src/nunjucks/routes/error/not-authorised.njk

@@ -9,9 +9,6 @@
       {% if signInHref %}
         <a href="{{ signInHref }}" role="button" draggable="false" class="govuk-button" data-module="govuk-button">Sign in</a>
       {% endif %}
-      {% if developmentMessage %}
-        <p class="govuk-body">{{ developmentMessage }}</p>
-      {% endif %}
     </div>
   </div>
 {% endblock %}

package/src/nunjucks/routes/error/page-not-found.njk

@@ -12,9 +12,6 @@
         <li><a class="govuk-link" href="https://www.gov.uk">GOV.UK</a></li>
       </ul>
       <p class="govuk-body">If you cannot find the information you need, <a class="govuk-link" href="{{ errorPages.contactHref }}">contact our support team</a>.</p>
-      {% if developmentMessage %}
-        <p class="govuk-body">{{ developmentMessage }}</p>
-      {% endif %}
     </div>
   </div>
 {% endblock %}

package/src/nunjucks/routes/error/problem-with-service.njk

@@ -6,9 +6,6 @@
       <h1 class="govuk-heading-l">Sorry, there is a problem with the service</h1>
       <p class="govuk-body">Try again later.</p>
       <p class="govuk-body">Contact the <a class="govuk-link" href="{{ errorPages.contactHref }}">British Cattle Movement Service (BCMS)</a> if you need to speak to someone about your account.</p>
-      {% if developmentMessage %}
-        <p class="govuk-body">{{ developmentMessage }}</p>
-      {% endif %}
     </div>
   </div>
 {% endblock %}

package/src/nunjucks/routes/error/service-unavailable.njk

@@ -10,9 +10,6 @@
         <p class="govuk-body">You will be able to use the service later.</p>
       {% endif %}
       <p class="govuk-body">Contact the <a class="govuk-link" href="{{ errorPages.contactHref }}">British Cattle Movement Service (BCMS)</a> if you need to speak to someone about your account.</p>
-      {% if developmentMessage %}
-        <p class="govuk-body">{{ developmentMessage }}</p>
-      {% endif %}
     </div>
   </div>
 {% endblock %}