tests: more e2e tests

Author: mnahkies

e2e/openapi.yaml

@@ -91,6 +91,13 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Enumerations'
+  /responses/500:
+    get:
+      tags:
+      - validation
+      responses:
+        500:
+          description: Internal Server Error
   /responses/empty:
     get:
       tags:

e2e/src/express.entrypoint.ts

@@ -3,6 +3,7 @@ import {type NextFunction, type Request, type Response, Router} from "express"
 import {bootstrap} from "./generated/server/express"
 import {createRequestHeadersRouter} from "./routes/express/request-headers"
 import {createValidationRouter} from "./routes/express/validation"
+import {createErrorResponse} from "./shared"
 
 function createRouter() {
   const router = Router()
@@ -32,23 +33,7 @@ export async function startExpressServer() {
       return next(err)
     }
 
-    const status = ExpressRuntimeError.isExpressError(err) ? 400 : 500
-    const body =
-      err instanceof Error
-        ? {
-            message: err.message,
-            phase: ExpressRuntimeError.isExpressError(err)
-              ? err.phase
-              : undefined,
-            cause:
-              err.cause instanceof Error
-                ? {
-                    message: err.cause.message,
-                  }
-                : undefined,
-          }
-        : {message: "non error thrown", value: err}
-
+    const {status, body} = createErrorResponse(err)
     res.status(status).json(body)
   })
 

e2e/src/generated/client/axios/client.ts

@@ -1,5 +1,6 @@
 import type {Server} from "node:http"
 import {beforeAll, describe, expect, it} from "@jest/globals"
+import type {AxiosError} from "axios"
 import {ApiClient} from "./generated/client/axios/client"
 import {E2ETestClientServers} from "./generated/client/fetch/client"
 import {startServerFunctions} from "./index"
@@ -57,6 +58,25 @@ describe.each(startServerFunctions)(
       })
     })
 
+    describe("404 handling", () => {
+      it("should handle 404s", async () => {
+        const err = await client
+          .getResponsesEmpty(undefined, {url: "/not-found"})
+          .then(
+            () => {
+              throw new Error("expected request to fail")
+            },
+            (err: unknown) => err,
+          )
+
+        expect(err).toMatchObject({
+          message: "Request failed with status code 404",
+          name: "AxiosError",
+          status: 404,
+        })
+      })
+    })
+
     describe("GET /headers/undeclared", () => {
       it("provides the default headers", async () => {
         const {data} = await client.getHeadersUndeclared()
@@ -174,22 +194,15 @@ describe.each(startServerFunctions)(
             () => {
               throw new Error("expected request to fail")
             },
-            (err) => err,
+            (err: AxiosError) => err,
           )
 
-        expect(err).toMatchObject({
-          message: "Request failed with status code 400",
-          name: "AxiosError",
-          status: 400,
-          response: expect.objectContaining({
-            data: {
-              message: "Request validation failed parsing request header",
-              phase: "request_validation",
-              cause: {
-                message: expect.stringMatching("Expected number, received nan"),
-              },
-            },
-          }),
+        expect(err.message).toMatch("Request failed with status code 400")
+        expect(err.status).toBe(400)
+        expect(err.response?.data).toMatchObject({
+          message: "Request validation failed parsing request header",
+          phase: "request_validation",
+          cause: expect.stringContaining("Expected number, received nan"),
         })
       })
     })
@@ -208,6 +221,30 @@ describe.each(startServerFunctions)(
         })
       })
 
+      it("returns 400 when parameters fail validation", async () => {
+        const err = await client
+          .getValidationNumbersRandomNumber({
+            // @ts-expect-error: testing runtime validation
+            min: "one",
+            // @ts-expect-error: testing runtime validation
+            max: "ten",
+          })
+          .then(
+            () => {
+              throw new Error("expected request to fail")
+            },
+            (err: AxiosError) => err,
+          )
+
+        expect(err.message).toMatch("Request failed with status code 400")
+        expect(err.status).toBe(400)
+        expect(err.response?.data).toMatchObject({
+          message: "Request validation failed parsing querystring",
+          phase: "request_validation",
+          cause: expect.stringContaining("Expected number, received nan"),
+        })
+      })
+
       it("handles a query param array of 1 element", async () => {
         const {data} = await client.getValidationNumbersRandomNumber({
           forbidden: [1],
@@ -252,5 +289,24 @@ describe.each(startServerFunctions)(
         expect(data).toEqual("")
       })
     })
+
+    describe("GET /responses/500", () => {
+      it("returns response from error middleware", async () => {
+        const err = await client.getResponses500().then(
+          () => {
+            throw new Error("expected request to fail")
+          },
+          (err: AxiosError) => err,
+        )
+
+        expect(err.message).toMatch("Request failed with status code 500")
+        expect(err.status).toBe(500)
+        expect(err.response?.data).toMatchObject({
+          message: "Request handler threw unhandled exception",
+          phase: "request_handler",
+          cause: expect.stringContaining("something went wrong"),
+        })
+      })
+    })
   },
 )