Thanks Claude

Author: thehabes

routes/__tests__/mount.test.js

@@ -16,27 +16,44 @@ afterEach(() => {
    */
 })
 
+/**
+ * Helper function to check if a route is registered in Express 5.
+ * In Express 5, app._router was replaced with app.router.
+ * Routes are checked by testing the matcher functions on each layer.
+ * 
+ * @param {Array<string>} routes - Array of route paths to check
+ * @returns {boolean} - True if all routes are found
+ */
+function checkRoutesExist(routes) {
+  const stack = app.router.stack
+  const foundRoutes = new Set()
+  
+  for (const layer of stack) {
+    if (layer.matchers && layer.matchers[0]) {
+      const matcher = layer.matchers[0]
+      // Test each route against this layer's matcher
+      for (const route of routes) {
+        const result = matcher(route)
+        if (result) {
+          foundRoutes.add(route)
+        }
+      }
+    }
+  }
+  
+  // Check if all expected routes were found
+  return routes.every(route => foundRoutes.has(route))
+}
+
 /**
  * This test suite uses the built app.js app and checks that the expected create endpoints are registered.
  *  - /create
  *  - /app/create
  */
 describe("Check that the expected TinyNode create route patterns are registered.", () => {
   it("'/app/create' and '/create' are registered routes in the app.  __exists __core", () => {
-    let exists = false
-    let count = 0
-    const stack = app._router.stack
-    for (const middleware of stack) {
-      if (middleware.regexp && middleware.regexp.toString().includes("/app/create")) {
-        count++
-      } else if (middleware.regexp && middleware.regexp.toString().includes("/create")) {
-        count++
-      }
-      if (count === 2) {
-        exists = true
-        break
-      }
-    }
+    const routes = ["/create", "/app/create"]
+    const exists = checkRoutesExist(routes)
     expect(exists).toBe(true)
   })
 })
@@ -48,20 +65,8 @@ describe("Check that the expected TinyNode create route patterns are registered.
  */
 describe("Check that the expected TinyNode query route patterns are registered.", () => {
   it("'/app/query' and '/query' are registered routes in the app.  __exists __core", () => {
-    let exists = false
-    let count = 0
-    const stack = app._router.stack
-    for (const middleware of stack) {
-      if (middleware.regexp && middleware.regexp.toString().includes("/app/query")) {
-        count++
-      } else if (middleware.regexp && middleware.regexp.toString().includes("/query")) {
-        count++
-      }
-      if (count === 2) {
-        exists = true
-        break
-      }
-    }
+    const routes = ["/query", "/app/query"]
+    const exists = checkRoutesExist(routes)
     expect(exists).toBe(true)
   })
 })
@@ -73,20 +78,8 @@ describe("Check that the expected TinyNode query route patterns are registered."
  */
 describe("Check that the expected TinyNode update route patterns are registered.", () => {
   it("'/app/update' and '/update' are registered routes in the app.  __exists __core", () => {
-    let exists = false
-    let count = 0
-    const stack = app._router.stack
-    for (const middleware of stack) {
-      if (middleware.regexp && middleware.regexp.toString().includes("/app/update")) {
-        count++
-      } else if (middleware.regexp && middleware.regexp.toString().includes("/update")) {
-        count++
-      }
-      if (count === 2) {
-        exists = true
-        break
-      }
-    }
+    const routes = ["/update", "/app/update"]
+    const exists = checkRoutesExist(routes)
     expect(exists).toBe(true)
   })
 })
@@ -99,20 +92,8 @@ describe("Check that the expected TinyNode update route patterns are registered.
  */
 describe("Check that the expected TinyNode overwrite route patterns are registered.", () => {
   it("'/app/overwrite' and '/overwrite' are registered routes in the app.  __exists __core", () => {
-    let exists = false
-    let count = 0
-    const stack = app._router.stack
-    for (const middleware of stack) {
-      if (middleware.regexp && middleware.regexp.toString().includes("/app/overwrite")) {
-        count++
-      } else if (middleware.regexp && middleware.regexp.toString().includes("/overwrite")) {
-        count++
-      }
-      if (count === 2) {
-        exists = true
-        break
-      }
-    }
+    const routes = ["/overwrite", "/app/overwrite"]
+    const exists = checkRoutesExist(routes)
     expect(exists).toBe(true)
   })
 })
@@ -124,20 +105,8 @@ describe("Check that the expected TinyNode overwrite route patterns are register
  */
 describe("Combined unit tests for the '/delete' route.", () => {
   it("'/app/delete' and '/delete' are registered routes in the app.  __exists __core", () => {
-    let exists = false
-    let count = 0
-    const stack = app._router.stack
-    for (const middleware of stack) {
-      if (middleware.regexp && middleware.regexp.toString().includes("/app/delete")) {
-        count++
-      } else if (middleware.regexp && middleware.regexp.toString().includes("/delete")) {
-        count++
-      }
-      if (count === 2) {
-        exists = true
-        break
-      }
-    }
+    const routes = ["/delete", "/app/delete"]
+    const exists = checkRoutesExist(routes)
     expect(exists).toBe(true)
   })
 })