@defra/lis-infra-ui-services 0.11.0 → 0.12.0

package/package.json

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

package/src/errors/index.js

@@ -19,7 +19,7 @@ function statusCodeMessage(statusCode) {
 }
 
 function getStatusCode(response) {
-  return response?.output?.statusCode ?? response?.statusCode
+  return response?.statusCode ?? response?.output?.statusCode
 }
 
 function getLogMessage(response, statusCode) {

package/src/errors/index.test.js

@@ -83,6 +83,31 @@ test('catchAll logs and renders generic content for server errors', () => {
   assert.deepEqual(logger.error.mock.calls[0], ['Mock error stack'])
 })
 
+test('catchAll prefers a client-attached statusCode over a boomified 500', () => {
+  const request = {
+    response: {
+      isBoom: true,
+      statusCode: statusCodes.notFound,
+      stack: 'Mock error stack',
+      output: { statusCode: statusCodes.internalServerError }
+    }
+  }
+  const toolkit = createToolkit()
+
+  catchAll(request, toolkit)
+
+  assert.deepEqual(toolkit.view.mock.calls[0], [
+    'error/index',
+    {
+      pageTitle: 'Page not found',
+      heading: statusCodes.notFound,
+      message: 'Page not found'
+    }
+  ])
+  assert.deepEqual(toolkit.code.mock.calls[0], [statusCodes.notFound])
+  assert.equal(logger.error.mock.calls.length, 0)
+})
+
 test('catchAll logs plain 500 responses before continuing', () => {
   const toolkit = createToolkit()
   const request = {