Fix merge conflict

Author: Nayana-Parameswarappa

src/client/auth.test.ts

@@ -39,7 +39,7 @@ describe('OAuth Authorization', () => {
         function mockResponseWithWWWAuthenticate(headerValue: string): Response {
             return {
                 headers: {
-                    get: jest.fn(name => (name === 'WWW-Authenticate' ? headerValue : null))
+                    get: vi.fn(name => (name === 'WWW-Authenticate' ? headerValue : null))
                 }
             } as unknown as Response;
         }
@@ -2368,7 +2368,7 @@ describe('OAuth Authorization', () => {
                 scope: providedScope
             });
 
-            const redirectCall = (mockProvider.redirectToAuthorization as jest.Mock).mock.calls[0];
+            const redirectCall = (mockProvider.redirectToAuthorization as vi.Mock).mock.calls[0];
             const authUrl: URL = redirectCall[0];
             expect(authUrl.searchParams.get('scope')).toBe(providedScope);
         });
@@ -2396,7 +2396,7 @@ describe('OAuth Authorization', () => {
                 serverUrl: 'https://api.example.com/mcp-server'
             });
 
-            const redirectCall = (mockProvider.redirectToAuthorization as jest.Mock).mock.calls[0];
+            const redirectCall = (mockProvider.redirectToAuthorization as vi.Mock).mock.calls[0];
             const authUrl: URL = redirectCall[0];
             expect(authUrl.searchParams.get('scope')).toBe(resourceScope);
         });
@@ -2424,7 +2424,7 @@ describe('OAuth Authorization', () => {
                 serverUrl: 'https://api.example.com/mcp-server'
             });
 
-            const redirectCall = (mockProvider.redirectToAuthorization as jest.Mock).mock.calls[0];
+            const redirectCall = (mockProvider.redirectToAuthorization as vi.Mock).mock.calls[0];
             const authUrl: URL = redirectCall[0];
             expect(authUrl.searchParams.get('scope')).toBe(clientMetadataScope);
         });

src/client/streamableHttp.test.ts

@@ -601,7 +601,7 @@ describe('StreamableHTTPClientTransport', () => {
             id: 'test-id'
         };
 
-        const fetchMock = global.fetch as jest.Mock;
+        const fetchMock = global.fetch as vi.Mock;
         fetchMock
             // First call: returns 403 with insufficient_scope
             .mockResolvedValueOnce({
@@ -623,7 +623,7 @@ describe('StreamableHTTPClientTransport', () => {
 
         // Spy on the imported auth function and mock successful authorization
         const authModule = await import('./auth.js');
-        const authSpy = jest.spyOn(authModule, 'auth');
+        const authSpy = vi.spyOn(authModule, 'auth');
         authSpy.mockResolvedValue('AUTHORIZED');
 
         await transport.send(message);
@@ -652,7 +652,7 @@ describe('StreamableHTTPClientTransport', () => {
         };
 
         // Mock fetch calls to always return 403 with insufficient_scope
-        const fetchMock = global.fetch as jest.Mock;
+        const fetchMock = global.fetch as vi.Mock;
         fetchMock.mockResolvedValue({
             ok: false,
             status: 403,
@@ -665,7 +665,7 @@ describe('StreamableHTTPClientTransport', () => {
 
         // Spy on the imported auth function and mock successful authorization
         const authModule = await import('./auth.js');
-        const authSpy = jest.spyOn(authModule, 'auth');
+        const authSpy = vi.spyOn(authModule, 'auth');
         authSpy.mockResolvedValue('AUTHORIZED');
 
         // First send: should trigger upscoping