fix tests

Author: nirinchev

tests/integration/tools/atlas-search/atlasSearchHelpers.ts

@@ -1,6 +1,6 @@
 import { ObjectId } from "bson";
 import { defaultTestConfig, IntegrationTest, setupIntegrationTest } from "../../helpers.js";
-import { deleteAndWaitCluster, waitClusterState, withProject } from "../atlas/atlasHelpers.js";
+import { waitClusterState, withProject } from "../atlas/atlasHelpers.js";
 
 export function describeWithAtlasSearch(
     name: string,
@@ -20,7 +20,7 @@ export function describeWithAtlasSearch(
 
         describe(name, () => {
             withProject(integration, ({ getProjectId }) => {
-                const clusterName = "ClusterTest-" + new ObjectId().toString();
+                const clusterName = `ClusterTest-${new ObjectId()}`;
                 beforeAll(async () => {
                     const projectId = getProjectId();
 
@@ -49,14 +49,6 @@ export function describeWithAtlasSearch(
                     });
                 });
 
-                afterAll(async () => {
-                    const projectId = getProjectId();
-
-                    const session = integration.mcpServer().session;
-
-                    await deleteAndWaitCluster(session, projectId, clusterName);
-                });
-
                 fn({
                     ...integration,
                     connectMcpClient: async () => {

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

@@ -22,23 +22,6 @@ describeWithAtlas("ip access lists", (integration) => {
             values.push(ipInfo.currentIpv4Address);
         });
 
-        afterAll(async () => {
-            const apiClient = integration.mcpServer().session.apiClient;
-
-            const projectId = getProjectId();
-
-            for (const value of values) {
-                await apiClient.deleteProjectIpAccessList({
-                    params: {
-                        path: {
-                            groupId: projectId,
-                            entryValue: value,
-                        },
-                    },
-                });
-            }
-        });
-
         describe("atlas-create-access-list", () => {
             it("should have correct metadata", async () => {
                 const { tools } = await integration.mcpClient().listTools();

tests/integration/tools/atlas/atlasHelpers.ts

@@ -35,17 +35,37 @@ type ProjectTestFunction = (args: ProjectTestArgs) => void;
 export function withProject(integration: IntegrationTest, fn: ProjectTestFunction): void {
     describe("with project", () => {
         let projectId: string = "";
+        const projectName = `testProj-${new ObjectId()}`;
 
         beforeAll(async () => {
             const apiClient = integration.mcpServer().session.apiClient;
 
-            const group = await createProject(apiClient);
+            const group = await createProject(apiClient, projectName);
             projectId = group.id || "";
         });
 
         afterAll(async () => {
             const apiClient = integration.mcpServer().session.apiClient;
 
+            const clusters = await apiClient.listClusters({
+                params: {
+                    path: {
+                        groupId: projectId,
+                    },
+                },
+            });
+
+            const deletePromises =
+                clusters?.results?.map((cluster) => {
+                    if (cluster.name) {
+                        return deleteAndWaitCluster(integration.mcpServer().session, projectId, cluster.name);
+                    }
+
+                    return Promise.resolve();
+                }) ?? [];
+
+            await Promise.all(deletePromises);
+
             await apiClient.deleteProject({
                 params: {
                     path: {
@@ -55,11 +75,9 @@ export function withProject(integration: IntegrationTest, fn: ProjectTestFunctio
             });
         });
 
-        const args = {
+        fn({
             getProjectId: () => projectId,
-        };
-
-        fn(args);
+        });
     });
 }
 
@@ -81,11 +99,7 @@ export function parseTable(text: string): Record<string, string>[] {
         });
 }
 
-export const randomId = new ObjectId().toString();
-
-async function createProject(apiClient: ApiClient): Promise<Group> {
-    const projectName: string = `testProj-` + randomId;
-
+async function createProject(apiClient: ApiClient, projectName: string): Promise<Group> {
     const orgs = await apiClient.listOrganizations();
     if (!orgs?.results?.length || !orgs.results[0].id) {
         throw new Error("No orgs found");
@@ -122,7 +136,7 @@ export async function waitClusterState(session: Session, projectId: string, clus
     }
 }
 
-export async function deleteAndWaitCluster(session: Session, projectId: string, clusterName: string) {
+async function deleteAndWaitCluster(session: Session, projectId: string, clusterName: string) {
     await session.apiClient.deleteCluster({
         params: {
             path: {

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

@@ -1,19 +1,11 @@
-import { Session } from "../../../../src/session.js";
+import { ObjectId } from "bson";
 import { expectDefined } from "../../helpers.js";
-import { describeWithAtlas, withProject, randomId, waitClusterState, deleteAndWaitCluster } from "./atlasHelpers.js";
+import { describeWithAtlas, withProject, waitClusterState } from "./atlasHelpers.js";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 
 describeWithAtlas("clusters", (integration) => {
     withProject(integration, ({ getProjectId }) => {
-        const clusterName = "ClusterTest-" + randomId;
-
-        afterAll(async () => {
-            const projectId = getProjectId();
-
-            const session: Session = integration.mcpServer().session;
-
-            await deleteAndWaitCluster(session, projectId, clusterName);
-        });
+        const clusterName = `ClusterTest-${new ObjectId()}`;
 
         describe("atlas-create-free-cluster", () => {
             it("should have correct metadata", async () => {

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

@@ -1,26 +1,11 @@
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { Session } from "../../../../src/session.js";
-import { describeWithAtlas, withProject, randomId } from "./atlasHelpers.js";
+import { describeWithAtlas, withProject } from "./atlasHelpers.js";
 import { expectDefined } from "../../helpers.js";
+import { ObjectId } from "bson";
 
 describeWithAtlas("db users", (integration) => {
-    const userName = "testuser-" + randomId;
+    const userName = `testuser-${new ObjectId()}`;
     withProject(integration, ({ getProjectId }) => {
-        afterAll(async () => {
-            const projectId = getProjectId();
-
-            const session: Session = integration.mcpServer().session;
-            await session.apiClient.deleteDatabaseUser({
-                params: {
-                    path: {
-                        groupId: projectId,
-                        username: userName,
-                        databaseName: "admin",
-                    },
-                },
-            });
-        });
-
         describe("atlas-create-db-user", () => {
             it("should have correct metadata", async () => {
                 const { tools } = await integration.mcpClient().listTools();

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

@@ -18,7 +18,7 @@ describeWithAtlas("orgs", (integration) => {
             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");
+            expect(data[0]["Organization Name"]).toBeDefined();
         });
     });
 });

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

@@ -3,10 +3,8 @@ import { ObjectId } from "mongodb";
 import { parseTable, describeWithAtlas } from "./atlasHelpers.js";
 import { expectDefined } from "../../helpers.js";
 
-const randomId = new ObjectId().toString();
-
 describeWithAtlas("projects", (integration) => {
-    const projName = "testProj-" + randomId;
+    const projName = `testProj-${new ObjectId()}`;
 
     afterAll(async () => {
         const session = integration.mcpServer().session;