modelcontextprotocol/typescript-sdk
Watch
1
0
Fork
You've already forked typescript-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Migrate to vitest from jest (#1074)

Browse source 
Co-authored-by: Felix Weinberger <3823880+felixweinberger@users.noreply.github.com>
Co-authored-by: Felix Weinberger <fweinberger@anthropic.com>
This commit is contained in:
Matt 2025-11-14 14:08:00 +00:00 • committed by GitHub
commit 98df118a4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1713 additions and 3434 deletions
Download patch file Download diff file Expand all files Collapse all files

95
src/client/middleware.test.ts
View file

@ -1,27 +1,28 @@
import { withOAuth, withLogging, applyMiddlewares, createMiddleware } from './middleware.js';
import { OAuthClientProvider } from './auth.js';
import { FetchLike } from '../shared/transport.js';
import { MockInstance, Mocked, MockedFunction } from 'vitest';
jest.mock('../client/auth.js', () => {
const actual = jest.requireActual('../client/auth.js');
vi.mock('../client/auth.js', async () => {
const actual = await vi.importActual<typeof import('../client/auth.js')>('../client/auth.js');
return {
...actual,
auth: jest.fn(),
extractWWWAuthenticateParams: jest.fn()
auth: vi.fn(),
extractWWWAuthenticateParams: vi.fn()
};
});
import { auth, extractWWWAuthenticateParams } from './auth.js';
const mockAuth = auth as jest.MockedFunction<typeof auth>;
const mockExtractWWWAuthenticateParams = extractWWWAuthenticateParams as jest.MockedFunction<typeof extractWWWAuthenticateParams>;
const mockAuth = auth as MockedFunction<typeof auth>;
const mockExtractWWWAuthenticateParams = extractWWWAuthenticateParams as MockedFunction<typeof extractWWWAuthenticateParams>;
describe('withOAuth', () => {
let mockProvider: jest.Mocked<OAuthClientProvider>;
let mockFetch: jest.MockedFunction<FetchLike>;
let mockProvider: Mocked<OAuthClientProvider>;
let mockFetch: MockedFunction<FetchLike>;
beforeEach(() => {
jest.clearAllMocks();
vi.clearAllMocks();
mockProvider = {
get redirectUrl() {
@ -30,16 +31,16 @@ describe('withOAuth', () => {
get clientMetadata() {
return { redirect_uris: ['http://localhost/callback'] };
},
tokens: jest.fn(),
saveTokens: jest.fn(),
clientInformation: jest.fn(),
redirectToAuthorization: jest.fn(),
saveCodeVerifier: jest.fn(),
codeVerifier: jest.fn(),
invalidateCredentials: jest.fn()
tokens: vi.fn(),
saveTokens: vi.fn(),
clientInformation: vi.fn(),
redirectToAuthorization: vi.fn(),
saveCodeVerifier: vi.fn(),
codeVerifier: vi.fn(),
invalidateCredentials: vi.fn()
};
mockFetch = jest.fn();
mockFetch = vi.fn();
});
it('should add Authorization header when tokens are available (with explicit baseUrl)', async () => {
@ -371,8 +372,8 @@ describe('withOAuth', () => {
});
describe('withLogging', () => {
let mockFetch: jest.MockedFunction<FetchLike>;
let mockLogger: jest.MockedFunction<
let mockFetch: MockedFunction<FetchLike>;
let mockLogger: MockedFunction<
(input: {
method: string;
url: string | URL;
@ -384,17 +385,17 @@ describe('withLogging', () => {
error?: Error;
}) => void
>;
let consoleErrorSpy: jest.SpyInstance;
let consoleLogSpy: jest.SpyInstance;
let consoleErrorSpy: MockInstance;
let consoleLogSpy: MockInstance;
beforeEach(() => {
jest.clearAllMocks();
vi.clearAllMocks();
consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
mockFetch = jest.fn();
mockLogger = jest.fn();
mockFetch = vi.fn();
mockLogger = vi.fn();
});
afterEach(() => {
@ -614,11 +615,11 @@ describe('withLogging', () => {
});
describe('applyMiddleware', () => {
let mockFetch: jest.MockedFunction<FetchLike>;
let mockFetch: MockedFunction<FetchLike>;
beforeEach(() => {
jest.clearAllMocks();
mockFetch = jest.fn();
vi.clearAllMocks();
mockFetch = vi.fn();
});
it('should compose no middleware correctly', () => {
@ -703,7 +704,7 @@ describe('applyMiddleware', () => {
};
// Use custom logger to avoid console output
const mockLogger = jest.fn();
const mockLogger = vi.fn();
const composedFetch = applyMiddlewares(oauthMiddleware, withLogging({ logger: mockLogger, statusLevel: 0 }))(mockFetch);
await composedFetch('https://api.example.com/data');
@ -743,11 +744,11 @@ describe('applyMiddleware', () => {
});
describe('Integration Tests', () => {
let mockProvider: jest.Mocked<OAuthClientProvider>;
let mockFetch: jest.MockedFunction<FetchLike>;
let mockProvider: Mocked<OAuthClientProvider>;
let mockFetch: MockedFunction<FetchLike>;
beforeEach(() => {
jest.clearAllMocks();
vi.clearAllMocks();
mockProvider = {
get redirectUrl() {
@ -756,16 +757,16 @@ describe('Integration Tests', () => {
get clientMetadata() {
return { redirect_uris: ['http://localhost/callback'] };
},
tokens: jest.fn(),
saveTokens: jest.fn(),
clientInformation: jest.fn(),
redirectToAuthorization: jest.fn(),
saveCodeVerifier: jest.fn(),
codeVerifier: jest.fn(),
invalidateCredentials: jest.fn()
tokens: vi.fn(),
saveTokens: vi.fn(),
clientInformation: vi.fn(),
redirectToAuthorization: vi.fn(),
saveCodeVerifier: vi.fn(),
codeVerifier: vi.fn(),
invalidateCredentials: vi.fn()
};
mockFetch = jest.fn();
mockFetch = vi.fn();
});
it('should work with SSE transport pattern', async () => {
@ -783,7 +784,7 @@ describe('Integration Tests', () => {
mockFetch.mockResolvedValue(response);
// Use custom logger to avoid console output
const mockLogger = jest.fn();
const mockLogger = vi.fn();
const enhancedFetch = applyMiddlewares(
withOAuth(mockProvider as OAuthClientProvider, 'https://mcp-server.example.com'),
withLogging({ logger: mockLogger, statusLevel: 400 }) // Only log errors
@ -830,7 +831,7 @@ describe('Integration Tests', () => {
mockFetch.mockResolvedValue(response);
// Use custom logger to avoid console output
const mockLogger = jest.fn();
const mockLogger = vi.fn();
const enhancedFetch = applyMiddlewares(
withOAuth(mockProvider as OAuthClientProvider, 'https://streamable-server.example.com'),
withLogging({
@ -891,7 +892,7 @@ describe('Integration Tests', () => {
mockAuth.mockResolvedValue('AUTHORIZED');
// Use custom logger to avoid console output
const mockLogger = jest.fn();
const mockLogger = vi.fn();
const enhancedFetch = applyMiddlewares(
withOAuth(mockProvider as OAuthClientProvider, 'https://mcp-server.example.com'),
withLogging({ logger: mockLogger, statusLevel: 0 })
@ -914,11 +915,11 @@ describe('Integration Tests', () => {
});
describe('createMiddleware', () => {
let mockFetch: jest.MockedFunction<FetchLike>;
let mockFetch: MockedFunction<FetchLike>;
beforeEach(() => {
jest.clearAllMocks();
mockFetch = jest.fn();
vi.clearAllMocks();
mockFetch = vi.fn();
});
it('should create middleware with cleaner syntax', async () => {