fix: orgs test

Author: fmenezes

tests/integration/helpers.ts

@@ -37,7 +37,7 @@ export function setupIntegrationTest(): IntegrationTest {
 
     let randomDbName: string;
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         const clientTransport = new InMemoryTransport();
         const serverTransport = new InMemoryTransport();
 

tests/integration/tools/atlas/atlasHelpers.ts

@@ -6,28 +6,22 @@ import { Session } from "../../../../src/session.js";
 
 export type IntegrationTestFunction = (integration: IntegrationTest) => void;
 
-export function describeTest(name: number | string | Function | jest.FunctionLike, fn: IntegrationTestFunction) {
-    return describe("test", () => {
-        const integration = setupIntegrationTest();
-        describe(name, () => {
-            fn(integration);
-        });
-    });
-}
-
 export function sleep(ms: number) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
 export function describeAtlas(name: number | string | Function | jest.FunctionLike, fn: IntegrationTestFunction) {
-    if (!process.env.MDB_MCP_API_CLIENT_ID?.length || !process.env.MDB_MCP_API_CLIENT_SECRET?.length) {
-        return describe.skip("atlas", () => {
-            describeTest(name, fn);
+    const testDefinition = () => {
+        const integration = setupIntegrationTest();
+        describe(name, () => {
+            fn(integration);
         });
+    };
+
+    if (!process.env.MDB_MCP_API_CLIENT_ID?.length || !process.env.MDB_MCP_API_CLIENT_SECRET?.length) {
+        return describe.skip("atlas", testDefinition);
     }
-    return describe("atlas", () => {
-        describeTest(name, fn);
-    });
+    return describe("atlas", testDefinition);
 }
 
 interface ProjectTestArgs {

tests/integration/tools/atlas/orgs.test.ts

@@ -2,25 +2,23 @@ import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { setupIntegrationTest } from "../../helpers.js";
 import { parseTable, describeAtlas } from "./atlasHelpers.js";
 
-describeAtlas("orgs", () => {
-    setupIntegrationTest("tests", (integration) => {
-        describe("atlas-list-orgs", () => {
-            it("should have correct metadata", async () => {
-                const { tools } = await integration.mcpClient().listTools();
-                const listOrgs = tools.find((tool) => tool.name === "atlas-list-orgs");
-                expect(listOrgs).toBeDefined();
-            });
+describeAtlas("orgs", (integration) => {
+    describe("atlas-list-orgs", () => {
+        it("should have correct metadata", async () => {
+            const { tools } = await integration.mcpClient().listTools();
+            const listOrgs = tools.find((tool) => tool.name === "atlas-list-orgs");
+            expect(listOrgs).toBeDefined();
+        });
 
-            it("returns org names", async () => {
-                const response = (await integration
-                    .mcpClient()
-                    .callTool({ name: "atlas-list-orgs", arguments: {} })) as CallToolResult;
-                expect(response.content).toBeArray();
-                expect(response.content).toHaveLength(1);
-                const data = parseTable(response.content[0].text as string);
-                expect(data).toHaveLength(1);
-                expect(data[0]["Organization Name"]).toEqual("MongoDB MCP Test");
-            });
+        it("returns org names", async () => {
+            const response = (await integration
+                .mcpClient()
+                .callTool({ name: "atlas-list-orgs", arguments: {} })) as CallToolResult;
+            expect(response.content).toBeArray();
+            expect(response.content).toHaveLength(1);
+            const data = parseTable(response.content[0].text as string);
+            expect(data).toHaveLength(1);
+            expect(data[0]["Organization Name"]).toEqual("MongoDB MCP Test");
         });
     });
 });