test: update swagger module test

Signed-off-by: Romain Lenzotti <[email protected]>
tsedio · Feb 29, 2024 · b353122 · b353122
1 parent 50637a9
commit b353122
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/packages/specs/swagger/src/SwaggerModule.spec.ts b/packages/specs/swagger/src/SwaggerModule.spec.ts
@@ -32,7 +32,7 @@ describe("SwaggerModule", () => {
       mod.$onRoutesInit();
       mod.$onRoutesInit();
 
-      expect(mod.app.get).toHaveBeenCalledWith("/doc", expect.any(Function));
+      expect(mod.app.use).toHaveBeenCalledWith("/doc", expect.any(Function));
       expect(mod.app.use).toHaveBeenCalledWith("/doc", expect.any(PlatformRouter));
       expect(PlatformRouter.prototype.get).toHaveBeenCalledWith("/swagger.json", expect.any(Function));
       expect(PlatformRouter.prototype.get).toHaveBeenCalledWith("/main.css", expect.any(Function));

diff --git a/packages/specs/swagger/src/middlewares/redirectMiddleware.spec.ts b/packages/specs/swagger/src/middlewares/redirectMiddleware.spec.ts
@@ -6,22 +6,25 @@ describe("redirectMiddleware and redirect", () => {
   afterEach(PlatformTest.reset);
   it("should create a middleware", () => {
     const ctx = PlatformTest.createRequestContext();
-    jest.spyOn(ctx.response.raw, "redirect").mockReturnValue(undefined);
+    jest.spyOn(ctx.response, "redirect").mockReturnValue(undefined);
+
     ctx.request.raw.url = "/path";
     ctx.request.raw.originalUrl = "/path";
+    ctx.request.raw.method = "GET";
 
     redirectMiddleware("/path")(ctx);
 
-    expect(ctx.response.raw.redirect).toHaveBeenCalledWith(302, "/path/");
+    expect(ctx.response.redirect).toHaveBeenCalledWith(302, "/path/");
   });
   it("should create a middleware and call next", () => {
     const ctx = PlatformTest.createRequestContext();
-    jest.spyOn(ctx.response.raw, "redirect");
+    jest.spyOn(ctx.response, "redirect");
     ctx.request.raw.url = "/path/";
+    ctx.request.raw.method = "GET";
     ctx.request.raw.originalUrl = "/path/";
 
     redirectMiddleware("/path")(ctx);
 
-    expect(ctx.response.raw.redirect).not.toHaveBeenCalled();
+    expect(ctx.response.redirect).not.toHaveBeenCalled();
   });
 });
diff --git a/packages/specs/swagger/src/middlewares/redirectMiddleware.ts b/packages/specs/swagger/src/middlewares/redirectMiddleware.ts
@@ -6,7 +6,7 @@ import {PlatformContext} from "@tsed/common";
  */
 export function redirectMiddleware(path: string) {
   return (ctx: PlatformContext) => {
-    if (ctx.request.method === "GET" && ctx.request.url === path && !ctx.request.url.match(/\/$/)) {
+    if (ctx.request.method?.toUpperCase() === "GET" && ctx.request.url === path && !ctx.request.url.match(/\/$/)) {
       ctx.response.redirect(302, `${path}/`);
     }
   };