move inits inside describe, fix timeout setting

Author: nirinchev

tests/integration/server.test.ts

@@ -2,19 +2,19 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { Server } from "../../src/server.js";
 import { setupIntegrationTest } from "./helpers.js";
 
-let client: Client;
-let server: Server;
+describe("Server integration test", () => {
+    let client: Client;
+    let server: Server;
 
-beforeEach(async () => {
-    ({ client, server } = await setupIntegrationTest());
-});
+    beforeEach(async () => {
+        ({ client, server } = await setupIntegrationTest());
+    });
 
-afterEach(async () => {
-    await client?.close();
-    await server?.close();
-});
+    afterEach(async () => {
+        await client?.close();
+        await server?.close();
+    });
 
-describe("Server integration test", () => {
     describe("list capabilities", () => {
         it("should return positive number of tools", async () => {
             const tools = await client.listTools();

tests/integration/tools/mongodb/connect.test.ts

@@ -6,28 +6,27 @@ import runner from "mongodb-runner";
 import defaultState from "../../../../src/state.js";
 import config from "../../../../src/config.js";
 
-let client: Client;
-let server: Server;
+describe("Connect tool", () => {
+    let client: Client;
+    let server: Server;
 
-let loadCredentialsMock: jest.SpyInstance | undefined;
-let cluster: runner.MongoCluster;
+    let loadCredentialsMock: jest.SpyInstance | undefined;
+    let cluster: runner.MongoCluster;
 
-beforeAll(async () => {
-    jest.setTimeout(30000);
-    cluster = await runMongoDB();
-});
+    beforeAll(async () => {
+        cluster = await runMongoDB();
+    }, 60_000);
 
-afterEach(async () => {
-    loadCredentialsMock?.mockRestore();
-    await client?.close();
-    await server?.close();
-});
+    afterEach(async () => {
+        loadCredentialsMock?.mockRestore();
+        await client?.close();
+        await server?.close();
+    });
 
-afterAll(async () => {
-    await cluster.close();
-});
+    afterAll(async () => {
+        await cluster.close();
+    });
 
-describe("Connect tool", () => {
     describe("with default config", () => {
         beforeEach(async () => {
             loadCredentialsMock = jest.spyOn(defaultState, "loadCredentials").mockImplementation(async () => true);