Define mWith~ within test description

Author: habara-k

test/middleware.spec.ts

@@ -13,19 +13,6 @@ const TEST_PORT = parseInt(process.env.TEST_PORT || "1234", 10);
 
 const m = middleware({ channelSecret: "test_channel_secret" });
 
-// Middleware with skipSignatureVerification function (always true)
-const mWithSkipAlwaysTrue = middleware({
-  channelSecret: "test_channel_secret",
-  skipSignatureVerification: () => true,
-});
-
-// Middleware with skipSignatureVerification function (dynamic behavior based on environment variable)
-let shouldSkipSignature = false;
-const mWithDynamicSkip = middleware({
-  channelSecret: "test_channel_secret",
-  skipSignatureVerification: () => shouldSkipSignature,
-});
-
 const getRecentReq = (): { body: Types.WebhookRequestBody } =>
   JSON.parse(readFileSync(join(__dirname, "helpers/request.json")).toString());
 
@@ -68,54 +55,32 @@ describe("middleware test", () => {
   });
 
   describe("With skipSignatureVerification functionality", () => {
-    // Port for always-true skip function
-    let alwaysTruePort: number;
-    // Port for dynamic skip function
-    let dynamicSkipPort: number;
-
-    beforeAll(() => {
-      alwaysTruePort = TEST_PORT + 1;
-      dynamicSkipPort = TEST_PORT + 2;
-      listen(alwaysTruePort, mWithSkipAlwaysTrue);
-      return listen(dynamicSkipPort, mWithDynamicSkip);
-    });
-
-    afterAll(() => {
-      close(alwaysTruePort);
-      return close(dynamicSkipPort);
-    });
+    let serverPort: number;
 
-    it("should skip signature verification when skipSignatureVerification returns true", async () => {
-      const client = new HTTPClient({
-        baseURL: `http://localhost:${alwaysTruePort}`,
+    const createClient = (port: number) =>
+      new HTTPClient({
+        baseURL: `http://localhost:${port}`,
         defaultHeaders: {
           "X-Line-Signature": "invalid_signature",
         },
       });
 
-      // This should work even with invalid signature because verification is skipped
-      await client.post("/webhook", {
-        events: [webhook],
-        destination: DESTINATION,
-      });
-
-      const req = getRecentReq();
-      deepEqual(req.body.destination, DESTINATION);
-      deepEqual(req.body.events, [webhook]);
+    afterEach(() => {
+      if (serverPort) {
+        close(serverPort);
+      }
     });
 
-    it("should respect dynamic skipSignatureVerification behavior - when true", async () => {
-      // Set to skip verification
-      shouldSkipSignature = true;
-
-      const client = new HTTPClient({
-        baseURL: `http://localhost:${dynamicSkipPort}`,
-        defaultHeaders: {
-          "X-Line-Signature": "invalid_signature",
-        },
+    it("should skip signature verification when skipSignatureVerification returns true", async () => {
+      serverPort = TEST_PORT + 1;
+      const m = middleware({
+        channelSecret: "test_channel_secret",
+        skipSignatureVerification: () => true,
       });
+      await listen(serverPort, m);
+
+      const client = createClient(serverPort);
 
-      // This should work even with invalid signature because verification is skipped
       await client.post("/webhook", {
         events: [webhook],
         destination: DESTINATION,
@@ -126,19 +91,17 @@ describe("middleware test", () => {
       deepEqual(req.body.events, [webhook]);
     });
 
-    it("should respect dynamic skipSignatureVerification behavior - when false", async () => {
-      // Set to NOT skip verification
-      shouldSkipSignature = false;
-
-      const client = new HTTPClient({
-        baseURL: `http://localhost:${dynamicSkipPort}`,
-        defaultHeaders: {
-          "X-Line-Signature": "invalid_signature",
-        },
+    it("should skip signature verification when skipSignatureVerification returns false", async () => {
+      serverPort = TEST_PORT + 2;
+      const m = middleware({
+        channelSecret: "test_channel_secret",
+        skipSignatureVerification: () => false,
       });
+      await listen(serverPort, m);
+
+      const client = createClient(serverPort);
 
       try {
-        // This should fail because signature verification is not skipped
         await client.post("/webhook", {
           events: [webhook],
           destination: DESTINATION,
@@ -153,6 +116,7 @@ describe("middleware test", () => {
       }
     });
   });
+
   afterAll(() => {
     close(TEST_PORT);
   });