fix: replace require() with jest.mock in core test

Author: Julian De Luca

src/shared/connection.ts

@@ -9,22 +9,22 @@ import { packageVersion } from "../version.js";
  * connection to that org; otherwise falls back to the default connectionProvider.
  */
 export async function getConnection(
-    organization: string | undefined,
-    connectionProvider: () => Promise<WebApi>,
-    tokenProvider: () => Promise<string>,
-    userAgentProvider: () => string
+  organization: string | undefined,
+  connectionProvider: () => Promise<WebApi>,
+  tokenProvider: () => Promise<string>,
+  userAgentProvider: () => string
 ): Promise<WebApi> {
-    if (!organization) {
-        return connectionProvider();
-    }
+  if (!organization) {
+    return connectionProvider();
+  }
 
-    const orgUrl = "https://dev.azure.com/" + organization;
-    const accessToken = await tokenProvider();
-    const authHandler = getBearerHandler(accessToken);
+  const orgUrl = "https://dev.azure.com/" + organization;
+  const accessToken = await tokenProvider();
+  const authHandler = getBearerHandler(accessToken);
 
-    return new WebApi(orgUrl, authHandler, undefined, {
-        productName: "AzureDevOps.MCP",
-        productVersion: packageVersion,
-        userAgent: userAgentProvider(),
-    });
+  return new WebApi(orgUrl, authHandler, undefined, {
+    productName: "AzureDevOps.MCP",
+    productVersion: packageVersion,
+    userAgent: userAgentProvider(),
+  });
 }

src/tools/auth.ts

@@ -32,7 +32,13 @@ async function getCurrentUserDetails(tokenProvider: () => Promise<string>, conne
 /**
  * Searches for identities using Azure DevOps Identity API
  */
-async function searchIdentities(identity: string, tokenProvider: () => Promise<string>, connectionProvider: () => Promise<WebApi>, userAgentProvider: () => string, organization?: string): Promise<IdentitiesResponse> {
+async function searchIdentities(
+  identity: string,
+  tokenProvider: () => Promise<string>,
+  connectionProvider: () => Promise<WebApi>,
+  userAgentProvider: () => string,
+  organization?: string
+): Promise<IdentitiesResponse> {
   const token = await tokenProvider();
   const connection = await getConnection(organization, connectionProvider, tokenProvider, userAgentProvider);
   const orgName = connection.serverUrl.split("/")[3];
@@ -63,7 +69,13 @@ async function searchIdentities(identity: string, tokenProvider: () => Promise<s
 /**
  * Gets the user ID from email or unique name using Azure DevOps Identity API
  */
-async function getUserIdFromEmail(userEmail: string, tokenProvider: () => Promise<string>, connectionProvider: () => Promise<WebApi>, userAgentProvider: () => string, organization?: string): Promise<string> {
+async function getUserIdFromEmail(
+  userEmail: string,
+  tokenProvider: () => Promise<string>,
+  connectionProvider: () => Promise<WebApi>,
+  userAgentProvider: () => string,
+  organization?: string
+): Promise<string> {
   const identities = await searchIdentities(userEmail, tokenProvider, connectionProvider, userAgentProvider, organization);
 
   if (!identities || identities.value?.length === 0) {

src/tools/repositories.ts

@@ -180,10 +180,10 @@ function configureRepoTools(server: McpServer, tokenProvider: () => Promise<stri
 
         const forkSource: GitForkRef | undefined = forkSourceRepositoryId
           ? {
-            repository: {
-              id: forkSourceRepositoryId,
-            },
-          }
+              repository: {
+                id: forkSourceRepositoryId,
+              },
+            }
           : undefined;
 
         const labelDefinitions: WebApiTagDefinition[] | undefined = labels ? labels.map((label) => ({ name: label })) : undefined;
@@ -355,7 +355,22 @@ function configureRepoTools(server: McpServer, tokenProvider: () => Promise<stri
       labels: z.array(z.string()).optional().describe("Array of label names to replace existing labels on the pull request. This will remove all current labels and add the specified ones."),
       organization: z.string().optional().describe("Override the default Azure DevOps organization. If not provided, the organization configured at startup (via CLI arg or env var) is used."),
     },
-    async ({ repositoryId, pullRequestId, title, description, isDraft, targetRefName, status, autoComplete, mergeStrategy, deleteSourceBranch, transitionWorkItems, bypassReason, labels, organization }) => {
+    async ({
+      repositoryId,
+      pullRequestId,
+      title,
+      description,
+      isDraft,
+      targetRefName,
+      status,
+      autoComplete,
+      mergeStrategy,
+      deleteSourceBranch,
+      transitionWorkItems,
+      bypassReason,
+      labels,
+      organization,
+    }) => {
       try {
         const connection = await getConnection(organization, connectionProvider, tokenProvider, userAgentProvider);
         const gitApi = await connection.getGitApi();
@@ -1593,9 +1608,9 @@ function configureRepoTools(server: McpServer, tokenProvider: () => Promise<stri
           commitId: item.commitId,
           contentMetadata: item.contentMetadata
             ? {
-              contentType: item.contentMetadata.contentType,
-              fileName: item.contentMetadata.fileName,
-            }
+                contentType: item.contentMetadata.contentType,
+                fileName: item.contentMetadata.fileName,
+              }
             : undefined,
         }));
 

src/tools/wiki.ts

@@ -255,7 +255,7 @@ function configureWikiTools(server: McpServer, tokenProvider: () => Promise<stri
               } else if (resp.status === 404) {
                 return { content: [{ type: "text", text: `Error fetching wiki page content: Page with id ${parsed.pageId} not found` }], isError: true };
               }
-            } catch { }
+            } catch {}
           }
         }
 

src/tools/work.ts

@@ -257,10 +257,10 @@ function configureWorkTools(server: McpServer, tokenProvider: () => Promise<stri
               ...rest,
               teamMember: member.teamMember
                 ? {
-                  displayName: member.teamMember.displayName,
-                  id: member.teamMember.id,
-                  uniqueName: member.teamMember.uniqueName,
-                }
+                    displayName: member.teamMember.displayName,
+                    id: member.teamMember.id,
+                    uniqueName: member.teamMember.uniqueName,
+                  }
                 : undefined,
             };
           }),
@@ -342,10 +342,10 @@ function configureWorkTools(server: McpServer, tokenProvider: () => Promise<stri
         const simplifiedResult = {
           teamMember: updatedCapacity.teamMember
             ? {
-              displayName: updatedCapacity.teamMember.displayName,
-              id: updatedCapacity.teamMember.id,
-              uniqueName: updatedCapacity.teamMember.uniqueName,
-            }
+                displayName: updatedCapacity.teamMember.displayName,
+                id: updatedCapacity.teamMember.id,
+                uniqueName: updatedCapacity.teamMember.uniqueName,
+              }
             : undefined,
           activities: updatedCapacity.activities,
           daysOff: updatedCapacity.daysOff,

test/src/tools/core.test.ts

@@ -5,6 +5,10 @@ import { describe, expect, it } from "@jest/globals";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { configureCoreTools } from "../../../src/tools/core";
 import { WebApi } from "azure-devops-node-api";
+import { getConnection } from "../../../src/shared/connection";
+
+jest.mock("../../../src/shared/connection");
+const mockGetConnection = getConnection as jest.MockedFunction<typeof getConnection>;
 
 type TokenProviderMock = () => Promise<string>;
 type ConnectionProviderMock = () => Promise<WebApi>;
@@ -37,6 +41,14 @@ describe("configureCoreTools", () => {
     };
 
     connectionProvider = jest.fn().mockResolvedValue(mockConnection);
+
+    // By default, getConnection delegates to connectionProvider
+    mockGetConnection.mockImplementation(async (organization, connProvider) => {
+      if (organization) {
+        return mockConnection as unknown as WebApi;
+      }
+      return connProvider();
+    });
   });
 
   describe("tool registration", () => {
@@ -329,10 +341,6 @@ describe("configureCoreTools", () => {
         },
       ]);
 
-      const WebApiModule = require("azure-devops-node-api");
-      const OriginalWebApi = WebApiModule.WebApi;
-      WebApiModule.WebApi = jest.fn().mockImplementation(() => mockConnection);
-
       const result = await handler({
         stateFilter: "wellFormed",
         top: undefined,
@@ -341,10 +349,8 @@ describe("configureCoreTools", () => {
         organization: "contoso",
       });
 
-      WebApiModule.WebApi = OriginalWebApi;
-
+      expect(mockGetConnection).toHaveBeenCalledWith("contoso", connectionProvider, tokenProvider, userAgentProvider);
       expect(connectionProvider).not.toHaveBeenCalled();
-      expect(tokenProvider).toHaveBeenCalled();
       expect(result.content[0].text).toContain("CrossOrgProject");
     });
   });