update tests

Author: blva

src/tools/atlas/connect/connectCluster.ts

@@ -13,6 +13,9 @@ const EXPIRY_MS = 1000 * 60 * 60 * 12; // 12 hours
 const addedIpAccessListMessage =
     "Note: Your current IP address has been added to the Atlas project's IP access list to enable secure connection.";
 
+const createdUserMessage =
+    "Note: A temporary user has been created to enable secure connection to the cluster. For more information, see https://dochub.mongodb.org/core/mongodb-mcp-server-tools-considerations";
+
 function sleep(ms: number): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -206,14 +209,20 @@ export class ConnectClusterTool extends AtlasToolBase {
                         },
                     ];
 
-                    // Add feedback about IP access list if it was updated
                     if (ipAccessListUpdated) {
                         content.push({
                             type: "text",
                             text: addedIpAccessListMessage,
                         });
                     }
 
+                    if (createdUser) {
+                        content.push({
+                            type: "text",
+                            text: createdUserMessage,
+                        });
+                    }
+
                     return { content };
                 }
                 case "connecting":
@@ -267,7 +276,7 @@ export class ConnectClusterTool extends AtlasToolBase {
         if (createdUser) {
             content.push({
                 type: "text" as const,
-                text: `Note: A temporary user has been created to enable secure connection to the cluster. For more information, see https://dochub.mongodb.org/core/mongodb-mcp-server-tools-considerations`,
+                text: createdUserMessage,
             });
         }
 

tests/integration/tools/atlas/atlasHelpers.ts

@@ -29,13 +29,15 @@ export function describeWithAtlas(name: string, fn: IntegrationTestFunction): vo
 
 interface ProjectTestArgs {
     getProjectId: () => string;
+    getIpAddress: () => string;
 }
 
 type ProjectTestFunction = (args: ProjectTestArgs) => void;
 
 export function withProject(integration: IntegrationTest, fn: ProjectTestFunction): SuiteCollector<object> {
     return describe("with project", () => {
         let projectId: string = "";
+        let ipAddress: string = "";
 
         beforeAll(async () => {
             const apiClient = integration.mcpServer().session.apiClient;
@@ -49,6 +51,8 @@ export function withProject(integration: IntegrationTest, fn: ProjectTestFunctio
             await apiClient.validateAccessToken();
             try {
                 const group = await createProject(apiClient);
+                const ipInfo = await apiClient.getIpInfo();
+                ipAddress = ipInfo.currentIpv4Address;
                 projectId = group.id;
             } catch (error) {
                 console.error("Failed to create project:", error);
@@ -72,6 +76,7 @@ export function withProject(integration: IntegrationTest, fn: ProjectTestFunctio
 
         const args = {
             getProjectId: (): string => projectId,
+            getIpAddress: (): string => ipAddress,
         };
 
         fn(args);

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

@@ -57,7 +57,7 @@ async function waitCluster(
 }
 
 describeWithAtlas("clusters", (integration) => {
-    withProject(integration, ({ getProjectId }) => {
+    withProject(integration, ({ getProjectId, getIpAddress }) => {
         const clusterName = "ClusterTest-" + randomId;
 
         afterAll(async () => {
@@ -162,6 +162,7 @@ describeWithAtlas("clusters", (integration) => {
         describe("atlas-connect-cluster", () => {
             beforeAll(async () => {
                 const projectId = getProjectId();
+                const ipAddress = getIpAddress();
                 await waitCluster(integration.mcpServer().session, projectId, clusterName, (cluster) => {
                     return (
                         cluster.stateName === "IDLE" &&
@@ -177,7 +178,7 @@ describeWithAtlas("clusters", (integration) => {
                     body: [
                         {
                             comment: "MCP test",
-                            cidrBlock: "0.0.0.0/0",
+                            ipAddress: ipAddress,
                         },
                     ],
                 });
@@ -196,6 +197,7 @@ describeWithAtlas("clusters", (integration) => {
 
             it("connects to cluster", async () => {
                 const projectId = getProjectId();
+                let connected = false;
 
                 for (let i = 0; i < 10; i++) {
                     const response = await integration.mcpClient().callTool({
@@ -205,16 +207,25 @@ describeWithAtlas("clusters", (integration) => {
 
                     const elements = getResponseElements(response.content);
                     expect(elements.length).toBeGreaterThanOrEqual(1);
-                    if (
-                        elements[0]?.text.includes("Cluster is already connected.") ||
-                        elements[0]?.text.includes(`Connected to cluster "${clusterName}"`)
-                    ) {
-                        break; // success
+                    if (elements[0]?.text.includes(`Connected to cluster "${clusterName}"`)) {
+                        connected = true;
+
+                        // assert that some of the element s have the message
+                        expect(
+                            elements.some((element) =>
+                                element.text.includes(
+                                    "Note: A temporary user has been created to enable secure connection to the cluster. For more information, see https://dochub.mongodb.org/core/mongodb-mcp-server-tools-considerations"
+                                )
+                            )
+                        ).toBe(true);
+
+                        break;
                     } else {
                         expect(elements[0]?.text).toContain(`Attempting to connect to cluster "${clusterName}"...`);
                     }
                     await sleep(500);
                 }
+                expect(connected).toBe(true);
             });
 
             describe("when not connected", () => {