@defra/forms-engine-plugin 2.0.3 → 2.1.1

package/.server/server/routes/dummy-api.js

@@ -0,0 +1,33 @@
+function calculateAge(day, month, year) {
+  const dobDate = new Date(Number(day), Number(month) - 1, Number(year));
+  const today = new Date();
+  let age = today.getFullYear() - dobDate.getFullYear();
+  const m = today.getMonth() - dobDate.getMonth();
+  if (m < 0 || m === 0 && today.getDate() < dobDate.getDate()) {
+    age--;
+  }
+  return age;
+}
+export default [{
+  method: 'POST',
+  path: '/api/example/on-load-page',
+  handler(request, _h) {
+    return {
+      submissionEvent: 'GET',
+      submissionReferenceNumber: request.payload.meta.referenceNumber
+    };
+  }
+}, {
+  method: 'POST',
+  path: '/api/example/on-summary',
+  handler(request, _h) {
+    const [day, month, year] = request.payload.data.main.dateOfBirth.split('-');
+    const age = calculateAge(day, month, year);
+    return {
+      calculatedAge: age,
+      submissionEvent: 'POST',
+      submissionReferenceNumber: request.payload.meta.referenceNumber // example of receiving a payload from DXT
+    };
+  }
+}];
+//# sourceMappingURL=dummy-api.js.map

package/.server/server/routes/dummy-api.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dummy-api.js","names":["calculateAge","day","month","year","dobDate","Date","Number","today","age","getFullYear","m","getMonth","getDate","method","path","handler","request","_h","submissionEvent","submissionReferenceNumber","payload","meta","referenceNumber","data","main","dateOfBirth","split","calculatedAge"],"sources":["../../../src/server/routes/dummy-api.ts"],"sourcesContent":["import { type Request, type ResponseToolkit } from '@hapi/hapi'\n\nfunction calculateAge(day: string, month: string, year: string) {\n  const dobDate = new Date(Number(day), Number(month) - 1, Number(year))\n\n  const today = new Date()\n\n  let age = today.getFullYear() - dobDate.getFullYear()\n  const m = today.getMonth() - dobDate.getMonth()\n\n  if (m < 0 || (m === 0 && today.getDate() < dobDate.getDate())) {\n    age--\n  }\n\n  return age\n}\n\nexport default [\n  {\n    method: 'POST',\n    path: '/api/example/on-load-page',\n    handler(\n      request: Request<{ Payload: { meta: { referenceNumber: string } } }>,\n      _h: ResponseToolkit\n    ) {\n      return {\n        submissionEvent: 'GET',\n        submissionReferenceNumber: request.payload.meta.referenceNumber\n      }\n    }\n  },\n  {\n    method: 'POST',\n    path: '/api/example/on-summary',\n    handler(\n      request: Request<{\n        Payload: {\n          data: {\n            main: {\n              applicantFirstName: string\n              applicantLastName: string\n              dateOfBirth: string\n            }\n          }\n          meta: { event: string; referenceNumber: string }\n        }\n      }>,\n      _h: ResponseToolkit\n    ) {\n      const [day, month, year] =\n        request.payload.data.main.dateOfBirth.split('-')\n\n      const age = calculateAge(day, month, year)\n\n      return {\n        calculatedAge: age,\n        submissionEvent: 'POST',\n        submissionReferenceNumber: request.payload.meta.referenceNumber // example of receiving a payload from DXT\n      }\n    }\n  }\n]\n"],"mappings":"AAEA,SAASA,YAAYA,CAACC,GAAW,EAAEC,KAAa,EAAEC,IAAY,EAAE;EAC9D,MAAMC,OAAO,GAAG,IAAIC,IAAI,CAACC,MAAM,CAACL,GAAG,CAAC,EAAEK,MAAM,CAACJ,KAAK,CAAC,GAAG,CAAC,EAAEI,MAAM,CAACH,IAAI,CAAC,CAAC;EAEtE,MAAMI,KAAK,GAAG,IAAIF,IAAI,CAAC,CAAC;EAExB,IAAIG,GAAG,GAAGD,KAAK,CAACE,WAAW,CAAC,CAAC,GAAGL,OAAO,CAACK,WAAW,CAAC,CAAC;EACrD,MAAMC,CAAC,GAAGH,KAAK,CAACI,QAAQ,CAAC,CAAC,GAAGP,OAAO,CAACO,QAAQ,CAAC,CAAC;EAE/C,IAAID,CAAC,GAAG,CAAC,IAAKA,CAAC,KAAK,CAAC,IAAIH,KAAK,CAACK,OAAO,CAAC,CAAC,GAAGR,OAAO,CAACQ,OAAO,CAAC,CAAE,EAAE;IAC7DJ,GAAG,EAAE;EACP;EAEA,OAAOA,GAAG;AACZ;AAEA,eAAe,CACb;EACEK,MAAM,EAAE,MAAM;EACdC,IAAI,EAAE,2BAA2B;EACjCC,OAAOA,CACLC,OAAoE,EACpEC,EAAmB,EACnB;IACA,OAAO;MACLC,eAAe,EAAE,KAAK;MACtBC,yBAAyB,EAAEH,OAAO,CAACI,OAAO,CAACC,IAAI,CAACC;IAClD,CAAC;EACH;AACF,CAAC,EACD;EACET,MAAM,EAAE,MAAM;EACdC,IAAI,EAAE,yBAAyB;EAC/BC,OAAOA,CACLC,OAWE,EACFC,EAAmB,EACnB;IACA,MAAM,CAAChB,GAAG,EAAEC,KAAK,EAAEC,IAAI,CAAC,GACtBa,OAAO,CAACI,OAAO,CAACG,IAAI,CAACC,IAAI,CAACC,WAAW,CAACC,KAAK,CAAC,GAAG,CAAC;IAElD,MAAMlB,GAAG,GAAGR,YAAY,CAACC,GAAG,EAAEC,KAAK,EAAEC,IAAI,CAAC;IAE1C,OAAO;MACLwB,aAAa,EAAEnB,GAAG;MAClBU,eAAe,EAAE,MAAM;MACvBC,yBAAyB,EAAEH,OAAO,CAACI,OAAO,CAACC,IAAI,CAACC,eAAe,CAAC;IAClE,CAAC;EACH;AACF,CAAC,CACF","ignoreList":[]}

package/.server/server/routes/index.d.ts

@@ -1 +1,2 @@
 export { default as publicRoutes } from '~/src/server/routes/public.js';
+export { default as dummyApiRoutes } from '~/src/server/routes/dummy-api.js';

package/.server/server/routes/index.js

@@ -1,2 +1,3 @@
 export { default as publicRoutes } from "./public.js";
+export { default as dummyApiRoutes } from "./dummy-api.js";
 //# sourceMappingURL=index.js.map

package/.server/server/routes/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["default","publicRoutes"],"sources":["../../../src/server/routes/index.ts"],"sourcesContent":["export { default as publicRoutes } from '~/src/server/routes/public.js'\n"],"mappings":"AAAA,SAASA,OAAO,IAAIC,YAAY","ignoreList":[]}
+{"version":3,"file":"index.js","names":["default","publicRoutes","dummyApiRoutes"],"sources":["../../../src/server/routes/index.ts"],"sourcesContent":["export { default as publicRoutes } from '~/src/server/routes/public.js'\nexport { default as dummyApiRoutes } from '~/src/server/routes/dummy-api.js'\n"],"mappings":"AAAA,SAASA,OAAO,IAAIC,YAAY;AAChC,SAASD,OAAO,IAAIE,cAAc","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "2.0.3",
+  "version": "2.1.1",
   "description": "Defra forms engine",
   "type": "module",
   "files": [
@@ -87,9 +87,9 @@
     "btoa": "^1.2.1",
     "convict": "^6.2.4",
     "date-fns": "^4.1.0",
-    "dotenv": "^17.0.1",
+    "dotenv": "^17.2.1",
     "expr-eval": "^2.0.2",
-    "govuk-frontend": "^5.10.2",
+    "govuk-frontend": "^5.11.1",
     "hapi-pino": "^12.1.0",
     "hapi-pulse": "^3.0.1",
     "highlight.js": "^11.11.1",
@@ -103,7 +103,7 @@
     "nunjucks": "^3.2.3",
     "outdent": "^0.8.0",
     "pino": "^9.7.0",
-    "pino-pretty": "^13.0.0",
+    "pino-pretty": "^13.1.1",
     "proxy-agent": "^6.5.0",
     "resolve": "^1.22.10",
     "yaml": "^2.8.0"
@@ -116,23 +116,23 @@
     "@babel/preset-typescript": "^7.27.1",
     "@hapi/basic": "^7.0.2",
     "@testing-library/dom": "^10.4.0",
-    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/jest-dom": "^6.6.4",
     "@types/atob": "^2.1.4",
     "@types/btoa": "^1.2.5",
     "@types/convict": "^6.1.6",
     "@types/eslint": "^9.6.1",
     "@types/govuk-frontend": "^5.9.0",
     "@types/hapi": "^18.0.14",
-    "@types/hapi__catbox-memory": "^4.1.8",
+    "@types/hapi__catbox-memory": "^6.0.2",
     "@types/hapi__cookie": "^12.0.5",
     "@types/hapi__crumb": "^7.3.7",
     "@types/hapi__yar": "^10.1.6",
     "@types/hoek": "^4.1.7",
     "@types/jest": "^30.0.0",
     "@types/jsdom": "^21.1.7",
-    "@types/lodash": "^4.17.17",
+    "@types/lodash": "^4.17.20",
     "@types/mysql": "^2.15.27",
-    "@types/node": "^24.0.2",
+    "@types/node": "^24.2.0",
     "@types/nunjucks": "^3.2.6",
     "@types/resolve": "^1.20.6",
     "@types/url-parse": "^1.4.11",
@@ -164,10 +164,12 @@
     "eslint-plugin-promise": "^6.6.0",
     "global-jsdom": "^26.0.0",
     "husky": "^9.1.7",
-    "jest": "^30.0.4",
-    "jest-extended": "^4.0.2",
+    "jest": "^30.0.5",
+    "jest-extended": "^6.0.0",
     "jsdom": "^26.1.0",
     "lint-staged": "^15.3.0",
+    "mockdate": "^3.0.5",
+    "nock": "^14.0.8",
     "postcss": "^8.5.6",
     "postcss-load-config": "^6.0.1",
     "postcss-loader": "^8.1.1",

package/src/client/javascripts/file-upload.js

@@ -66,10 +66,10 @@ function findOrCreateSummaryList(form, fileCountP) {
     summaryList = document.createElement('dl')
     summaryList.className = 'govuk-summary-list govuk-summary-list--long-key'
 
-    const continueButton = form.querySelector('.govuk-button')
+    const buttonGroup = form.querySelector('.govuk-button-group')
 
-    if (continueButton) {
-      form.insertBefore(summaryList, continueButton)
+    if (buttonGroup) {
+      form.insertBefore(summaryList, buttonGroup)
     } else {
       form.insertBefore(summaryList, fileCountP.nextSibling)
     }

package/src/server/forms/page-events.yaml

@@ -0,0 +1,87 @@
+---
+name: Page events
+engine: V2
+schema: 2
+startPage: '/summary'
+pages:
+  - title: Your name
+    path: '/your-name'
+    components:
+      - type: TextField
+        title: What is your first name?
+        name: applicantFirstName
+        shortDescription: Your first name
+        hint: ''
+        options:
+          required: true
+        schema: {}
+        id: 1fb8e182-c709-4792-8f83-e01d8b1fee1a
+      - type: TextField
+        title: What is your last name?
+        name: applicantLastName
+        shortDescription: Your last name
+        hint: ''
+        options:
+          required: true
+        schema: {}
+        id: b68df7f1-d4f4-4c17-83c8-402f584906c9
+    next: []
+    id: 622a35ec-3795-418a-81f3-a45746959045
+  - title: ''
+    path: '/date-of-birth'
+    events:
+      onLoad:
+        type: http
+        options:
+          method: 'POST'
+          url: http://localhost:3009/api/example/on-load-page
+    components:
+      - type: Html
+        # technically context.data.submissionReferenceNumber is redundant as the reference number is available locally as context.referenceNumber
+        # but this is to demonstrate that the server can send data back to the client
+        content: >
+          <p class="govuk-body">
+            The backend received a full copy of the form state even though you haven't submitted the form yet.
+          </p>
+          <p class="govuk-body">
+            Your submission was received with the reference: <strong>{{ context.data.submissionReferenceNumber }}</strong>.
+          </p>
+        id: 334b10dc-3373-4928-8fed-575578a67de8
+      - type: DatePartsField
+        title: When is {{ applicantFirstName }} {{ applicantLastName }}'s birthday?
+        name: dateOfBirth
+        shortDescription: Your birthday
+        hint: ''
+        options:
+          required: true
+        schema: {}
+        id: '00738799-3489-4ab2-a57b-542eecb31bfa'
+    next: []
+    id: da0fbdb4-a2de-4650-be16-9ba552af135f
+  - id: 449a45f6-4541-4a46-91bd-8b8931b07b50
+    title: Summary
+    path: '/summary'
+    controller: SummaryPageController
+    events:
+      onLoad:
+        type: http
+        options:
+          method: 'POST'
+          url: http://localhost:3009/api/example/on-summary
+      onSave:
+        type: http
+        options:
+          method: 'POST'
+          url: http://localhost:3009/api/example/on-summary
+    components:
+      - type: Html
+        content: >
+          <h2 class="govuk-heading-m">Your age</h1>
+          <p class="govuk-body">
+            We've calculated that you are {{ context.data.calculatedAge }} years old. Only proceed if this is correct.
+          </p>
+        id: c42ea488-a38c-4b67-b8fa-4cf543a4f82d
+    next: []
+conditions: []
+sections: []
+lists: []

package/src/server/index.ts

@@ -3,7 +3,8 @@ import { Engine as CatboxRedis } from '@hapi/catbox-redis'
 import hapi, {
   type Request,
   type ResponseToolkit,
-  type ServerOptions
+  type ServerOptions,
+  type ServerRoute
 } from '@hapi/hapi'
 import inert from '@hapi/inert'
 import Scooter from '@hapi/scooter'
@@ -21,7 +22,7 @@ import pluginErrorPages from '~/src/server/plugins/errorPages.js'
 import { plugin as pluginViews } from '~/src/server/plugins/nunjucks/index.js'
 import pluginPulse from '~/src/server/plugins/pulse.js'
 import pluginSession from '~/src/server/plugins/session.js'
-import { publicRoutes } from '~/src/server/routes/index.js'
+import { dummyApiRoutes, publicRoutes } from '~/src/server/routes/index.js'
 import { prepareSecureContext } from '~/src/server/secure-context.js'
 import { type RouteConfig } from '~/src/server/types.js'
 
@@ -120,6 +121,7 @@ export async function createServer(routeConfig?: RouteConfig) {
       name: 'router',
       register: (server) => {
         server.route(publicRoutes)
+        server.route(dummyApiRoutes as ServerRoute[])
       }
     }
   })

package/src/server/plugins/engine/routes/questions.test.ts

@@ -0,0 +1,416 @@
+import Boom from '@hapi/boom'
+import { type ResponseObject, type ResponseToolkit } from '@hapi/hapi'
+// eslint-disable-next-line n/no-unpublished-import
+import nock from 'nock'
+
+import { type FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
+import { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers.js'
+import { redirectOrMakeHandler } from '~/src/server/plugins/engine/routes/index.js'
+import {
+  makeGetHandler,
+  makePostHandler
+} from '~/src/server/plugins/engine/routes/questions.js'
+import { type FormContext } from '~/src/server/plugins/engine/types.js'
+import {
+  type FormRequest,
+  type FormRequestPayload
+} from '~/src/server/routes/types.js'
+jest.mock('~/src/server/plugins/engine/models/SummaryViewModel', () => ({
+  SummaryViewModel: class {
+    summary = 'mocked summary'
+  }
+}))
+
+jest.mock(
+  '~/src/server/plugins/engine/pageControllers/SummaryPageController',
+  () => ({
+    getFormSubmissionData: jest.fn().mockReturnValue([])
+  })
+)
+
+jest.mock('~/src/server/plugins/engine/outputFormatters/machine/v1', () => ({
+  format: jest.fn().mockReturnValue('mocked format')
+}))
+
+jest.mock('~/src/server/plugins/engine/routes/index')
+
+describe('makeGetHandler', () => {
+  const hMock: Pick<ResponseToolkit, 'redirect' | 'view'> = {
+    redirect: jest.fn(),
+    view: jest.fn()
+  }
+
+  beforeEach(() => {
+    nock('http://test').persist().post('/load').reply(200, {
+      wasGetCalled: true
+    })
+  })
+
+  afterEach(() => {
+    jest.mocked(redirectOrMakeHandler).mockRestore()
+    nock.cleanAll()
+  })
+
+  it('calls the callback when events.onLoad.type is http', async () => {
+    let data = {}
+
+    const modelMock = {
+      basePath: 'some-base-path',
+      def: { name: 'Hello world' }
+    } as FormModel
+
+    const pageMock = createMockPageController(
+      modelMock,
+      (
+        _request: FormRequest,
+        context: FormContext,
+        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+      ) => {
+        data = context.data
+        return Promise.resolve({} as unknown as ResponseObject)
+      }
+    )
+
+    const contextMock = { data: {}, model: {} } as unknown as FormContext
+
+    const requestMock = {
+      params: { path: 'some-path' },
+      app: { model: modelMock }
+    } as FormRequest
+
+    jest
+      .mocked(redirectOrMakeHandler)
+      .mockImplementation(
+        (
+          _req: FormRequest | FormRequestPayload,
+          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
+          fn
+        ) => Promise.resolve(fn(pageMock, contextMock))
+      )
+
+    await makeGetHandler()(requestMock, hMock)
+
+    expect(data).toMatchObject({
+      wasGetCalled: true
+    })
+  })
+
+  it('does not call the callback when the events.onLoad.type is not http', async () => {
+    let data = {}
+
+    const modelMock = {
+      basePath: 'some-base-path',
+      def: { name: 'Hello world' }
+    } as FormModel
+
+    const pageMock = createMockPageController(
+      modelMock,
+      (
+        _request: FormRequest,
+        context: FormContext,
+        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+      ) => {
+        data = context.data
+        return Promise.resolve({} as unknown as ResponseObject)
+      }
+    )
+
+    pageMock.events = {}
+
+    const contextMock = { data: {}, model: {} } as unknown as FormContext
+
+    const requestMock = {
+      params: { path: 'some-path' },
+      app: { model: modelMock }
+    } as FormRequest
+
+    jest
+      .mocked(redirectOrMakeHandler)
+      .mockImplementation(
+        (
+          _req: FormRequest | FormRequestPayload,
+          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
+          fn
+        ) => Promise.resolve(fn(pageMock, contextMock))
+      )
+
+    await makeGetHandler()(requestMock, hMock)
+
+    expect(data).toMatchObject({})
+  })
+
+  it('throws when model is missing', async () => {
+    let error
+
+    const modelMock = {
+      basePath: 'some-base-path',
+      def: { name: 'Hello world' }
+    } as FormModel
+
+    const pageMock = createMockPageController(
+      modelMock,
+      (
+        _request: FormRequest,
+        _context: FormContext,
+        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+      ) => {
+        return Promise.resolve({} as unknown as ResponseObject)
+      }
+    )
+
+    const contextMock = { data: {}, model: {} } as unknown as FormContext
+
+    const requestMock = {
+      params: { path: 'some-path' },
+      app: {}
+    } as FormRequest
+
+    jest
+      .mocked(redirectOrMakeHandler)
+      .mockImplementation(
+        async (
+          _req: FormRequest | FormRequestPayload,
+          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
+          fn
+        ) => {
+          try {
+            await fn(pageMock, contextMock)
+          } catch (err) {
+            error = err
+          }
+
+          return Promise.resolve({} as unknown as ResponseObject)
+        }
+      )
+
+    await makeGetHandler()(requestMock, hMock)
+
+    expect(error).toEqual(Boom.notFound('No model found for /some-path'))
+  })
+})
+
+describe('makePostHandler', () => {
+  const hMock: Pick<ResponseToolkit, 'redirect' | 'view'> = {
+    redirect: jest.fn(),
+    view: jest.fn()
+  }
+
+  beforeEach(() => {
+    nock('http://test').post('/save').reply(200, {
+      wasPostCalled: true
+    })
+  })
+
+  afterEach(() => {
+    jest.mocked(redirectOrMakeHandler).mockRestore()
+    nock.cleanAll()
+  })
+
+  it('calls the callback when events.onSave.type is http and the page controller was successful', async () => {
+    const mockPostResponse: ResponseObject = {
+      statusCode: 200
+    } as ResponseObject
+
+    const modelMock = {
+      basePath: 'some-base-path',
+      def: { name: 'Hello world' }
+    } as FormModel
+
+    const pageMock = createMockPageController(
+      modelMock,
+      (
+        _request: FormRequest,
+        _context: FormContext,
+        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+      ) => {
+        // do return a valid ResponseObject wrapped in Promise.resolve
+        return mockPostResponse
+      }
+    )
+
+    const contextMock = { data: {}, model: {} } as unknown as FormContext
+
+    const requestMock = {
+      params: { path: 'some-path' },
+      app: { model: modelMock },
+      payload: { some: 'payload' }
+    } as unknown as FormRequestPayload
+
+    jest
+      .mocked(redirectOrMakeHandler)
+      .mockImplementation(
+        (
+          _req: FormRequest | FormRequestPayload,
+          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
+          fn
+        ) => Promise.resolve(fn(pageMock, contextMock))
+      )
+
+    const response = await makePostHandler()(requestMock, hMock)
+
+    expect(nock.pendingMocks()).toBeEmpty()
+    expect(response).toBe(mockPostResponse)
+  })
+
+  it('does not call the callback when the events.onSave.type is not http', async () => {
+    const modelMock = {
+      basePath: 'some-base-path',
+      def: { name: 'Hello world' }
+    } as FormModel
+
+    const pageMock = createMockPageController(
+      modelMock,
+      (
+        _request: FormRequest,
+        _context: FormContext,
+        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+      ) => {
+        return Promise.resolve({} as unknown as ResponseObject)
+      }
+    )
+
+    pageMock.events = {}
+
+    const contextMock = { data: {}, model: {} } as unknown as FormContext
+
+    const requestMock = {
+      params: { path: 'some-path' },
+      app: { model: modelMock },
+      payload: { some: 'payload' }
+    } as unknown as FormRequestPayload
+
+    jest
+      .mocked(redirectOrMakeHandler)
+      .mockImplementation(
+        (
+          _req: FormRequest | FormRequestPayload,
+          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
+          fn
+        ) => Promise.resolve(fn(pageMock, contextMock))
+      )
+
+    await makePostHandler()(requestMock, hMock)
+
+    expect(nock.pendingMocks()).not.toBeEmpty()
+  })
+
+  it('does not call the callback when events.onSave.type is http and the page controller was unsuccessful', async () => {
+    const mockPostResponse: ResponseObject = {
+      statusCode: 500
+    } as ResponseObject
+
+    const modelMock = {
+      basePath: 'some-base-path',
+      def: { name: 'Hello world' }
+    } as FormModel
+
+    const pageMock = createMockPageController(
+      modelMock,
+      (
+        _request: FormRequest,
+        _context: FormContext,
+        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+      ) => {
+        // do return a valid ResponseObject wrapped in Promise.resolve
+        return mockPostResponse
+      }
+    )
+
+    const contextMock = { data: {}, model: {} } as unknown as FormContext
+
+    const requestMock = {
+      params: { path: 'some-path' },
+      app: { model: modelMock },
+      payload: { some: 'payload' }
+    } as unknown as FormRequestPayload
+
+    jest
+      .mocked(redirectOrMakeHandler)
+      .mockImplementation(
+        (
+          _req: FormRequest | FormRequestPayload,
+          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
+          fn
+        ) => Promise.resolve(fn(pageMock, contextMock))
+      )
+
+    await makePostHandler()(requestMock, hMock)
+
+    expect(nock.pendingMocks()).not.toBeEmpty()
+  })
+
+  it('throws when model is missing', async () => {
+    let error
+
+    const modelMock = {
+      basePath: 'some-base-path',
+      def: { name: 'Hello world' }
+    } as FormModel
+
+    const pageMock = createMockPageController(
+      modelMock,
+      (
+        _request: FormRequest,
+        _context: FormContext,
+        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+      ) => {
+        return Promise.resolve({} as unknown as ResponseObject)
+      }
+    )
+
+    const contextMock = { data: {}, model: {} } as unknown as FormContext
+
+    const requestMock = {
+      params: { path: 'some-path' },
+      app: {},
+      payload: { some: 'payload' }
+    } as unknown as FormRequestPayload
+
+    jest
+      .mocked(redirectOrMakeHandler)
+      .mockImplementation(
+        async (
+          _req: FormRequest | FormRequestPayload,
+          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
+          fn
+        ) => {
+          try {
+            await fn(pageMock, contextMock)
+          } catch (err) {
+            error = err
+          }
+
+          return Promise.resolve({} as unknown as ResponseObject)
+        }
+      )
+
+    await makePostHandler()(requestMock, hMock)
+
+    expect(error).toEqual(Boom.notFound('No model found for /some-path'))
+  })
+})
+
+function createMockPageController(
+  model: FormModel,
+  routeHandler: (
+    request: FormRequest,
+    context: FormContext,
+    h: Pick<ResponseToolkit, 'redirect' | 'view'>
+  ) => ResponseObject | Promise<ResponseObject>
+): PageControllerClass {
+  return {
+    model,
+    events: {
+      onLoad: {
+        type: 'http',
+        options: { method: 'POST', url: 'http://test/load' }
+      },
+      onSave: {
+        type: 'http',
+        options: { method: 'POST', url: 'http://test/save' }
+      }
+    },
+    makeGetRouteHandler: () => routeHandler,
+    makePostRouteHandler: () => routeHandler
+  } as unknown as PageControllerClass
+}