Skip to content

Commit 269c8ca

Browse files
fredericbartheletfredericbarthelet
committed
Remove server-specific capabilities definition from Client constructor in mcp tests
1 parent 5f5180c commit 269c8ca

File tree

1 file changed

+72
-199
lines changed

1 file changed

+72
-199
lines changed

‎src/server/mcp.test.ts

Lines changed: 72 additions & 199 deletions
Original file line numberDiff line numberDiff line change
@@ -913,18 +913,10 @@ describe("tool()", () => {
913913
name: "test server",
914914
version: "1.0",
915915
});
916-
917-
const client = new Client(
918-
{
919-
name: "test client",
920-
version: "1.0",
921-
},
922-
{
923-
capabilities: {
924-
tools: {},
925-
},
926-
},
927-
);
916+
const client = new Client({
917+
name: "test client",
918+
version: "1.0",
919+
});
928920

929921
mcpServer.tool(
930922
"test",
@@ -1056,17 +1048,10 @@ describe("tool()", () => {
10561048
version: "1.0",
10571049
});
10581050

1059-
const client = new Client(
1060-
{
1061-
name: "test client",
1062-
version: "1.0",
1063-
},
1064-
{
1065-
capabilities: {
1066-
tools: {},
1067-
},
1068-
},
1069-
);
1051+
const client = new Client({
1052+
name: "test client",
1053+
version: "1.0",
1054+
});
10701055

10711056
// Register a tool with outputSchema
10721057
mcpServer.registerTool(
@@ -1169,17 +1154,10 @@ describe("tool()", () => {
11691154
version: "1.0",
11701155
});
11711156

1172-
const client = new Client(
1173-
{
1174-
name: "test client",
1175-
version: "1.0",
1176-
},
1177-
{
1178-
capabilities: {
1179-
tools: {},
1180-
},
1181-
},
1182-
);
1157+
const client = new Client({
1158+
name: "test client",
1159+
version: "1.0",
1160+
});
11831161

11841162
// Register a tool with outputSchema that returns only content without structuredContent
11851163
mcpServer.registerTool(
@@ -1233,17 +1211,10 @@ describe("tool()", () => {
12331211
version: "1.0",
12341212
});
12351213

1236-
const client = new Client(
1237-
{
1238-
name: "test client",
1239-
version: "1.0",
1240-
},
1241-
{
1242-
capabilities: {
1243-
tools: {},
1244-
},
1245-
},
1246-
);
1214+
const client = new Client({
1215+
name: "test client",
1216+
version: "1.0",
1217+
});
12471218

12481219
// Register a tool with outputSchema that returns invalid data
12491220
mcpServer.registerTool(
@@ -1308,17 +1279,10 @@ describe("tool()", () => {
13081279
version: "1.0",
13091280
});
13101281

1311-
const client = new Client(
1312-
{
1313-
name: "test client",
1314-
version: "1.0",
1315-
},
1316-
{
1317-
capabilities: {
1318-
tools: {},
1319-
},
1320-
},
1321-
);
1282+
const client = new Client({
1283+
name: "test client",
1284+
version: "1.0",
1285+
});
13221286

13231287
let receivedSessionId: string | undefined;
13241288
mcpServer.tool("test-tool", async (extra) => {
@@ -1364,17 +1328,10 @@ describe("tool()", () => {
13641328
version: "1.0",
13651329
});
13661330

1367-
const client = new Client(
1368-
{
1369-
name: "test client",
1370-
version: "1.0",
1371-
},
1372-
{
1373-
capabilities: {
1374-
tools: {},
1375-
},
1376-
},
1377-
);
1331+
const client = new Client({
1332+
name: "test client",
1333+
version: "1.0",
1334+
});
13781335

13791336
let receivedRequestId: string | number | undefined;
13801337
mcpServer.tool("request-id-test", async (extra) => {
@@ -1423,17 +1380,10 @@ describe("tool()", () => {
14231380
{ capabilities: { logging: {} } },
14241381
);
14251382

1426-
const client = new Client(
1427-
{
1428-
name: "test client",
1429-
version: "1.0",
1430-
},
1431-
{
1432-
capabilities: {
1433-
tools: {},
1434-
},
1435-
},
1436-
);
1383+
const client = new Client({
1384+
name: "test client",
1385+
version: "1.0",
1386+
});
14371387

14381388
let receivedLogMessage: string | undefined;
14391389
const loggingMessage = "hello here is log message 1";
@@ -1480,17 +1430,10 @@ describe("tool()", () => {
14801430
version: "1.0",
14811431
});
14821432

1483-
const client = new Client(
1484-
{
1485-
name: "test client",
1486-
version: "1.0",
1487-
},
1488-
{
1489-
capabilities: {
1490-
tools: {},
1491-
},
1492-
},
1493-
);
1433+
const client = new Client({
1434+
name: "test client",
1435+
version: "1.0",
1436+
});
14941437

14951438
mcpServer.tool(
14961439
"test",
@@ -1546,17 +1489,10 @@ describe("tool()", () => {
15461489
version: "1.0",
15471490
});
15481491

1549-
const client = new Client(
1550-
{
1551-
name: "test client",
1552-
version: "1.0",
1553-
},
1554-
{
1555-
capabilities: {
1556-
tools: {},
1557-
},
1558-
},
1559-
);
1492+
const client = new Client({
1493+
name: "test client",
1494+
version: "1.0",
1495+
});
15601496

15611497
mcpServer.tool("error-test", async () => {
15621498
throw new Error("Tool execution failed");
@@ -1598,17 +1534,10 @@ describe("tool()", () => {
15981534
version: "1.0",
15991535
});
16001536

1601-
const client = new Client(
1602-
{
1603-
name: "test client",
1604-
version: "1.0",
1605-
},
1606-
{
1607-
capabilities: {
1608-
tools: {},
1609-
},
1610-
},
1611-
);
1537+
const client = new Client({
1538+
name: "test client",
1539+
version: "1.0",
1540+
});
16121541

16131542
mcpServer.tool("test-tool", async () => ({
16141543
content: [
@@ -2401,17 +2330,10 @@ describe("resource()", () => {
24012330
version: "1.0",
24022331
});
24032332

2404-
const client = new Client(
2405-
{
2406-
name: "test client",
2407-
version: "1.0",
2408-
},
2409-
{
2410-
capabilities: {
2411-
resources: {},
2412-
},
2413-
},
2414-
);
2333+
const client = new Client({
2334+
name: "test client",
2335+
version: "1.0",
2336+
});
24152337

24162338
mcpServer.resource(
24172339
"test",
@@ -2469,17 +2391,10 @@ describe("resource()", () => {
24692391
version: "1.0",
24702392
});
24712393

2472-
const client = new Client(
2473-
{
2474-
name: "test client",
2475-
version: "1.0",
2476-
},
2477-
{
2478-
capabilities: {
2479-
resources: {},
2480-
},
2481-
},
2482-
);
2394+
const client = new Client({
2395+
name: "test client",
2396+
version: "1.0",
2397+
});
24832398

24842399
mcpServer.resource(
24852400
"test",
@@ -2540,17 +2455,10 @@ describe("resource()", () => {
25402455
version: "1.0",
25412456
});
25422457

2543-
const client = new Client(
2544-
{
2545-
name: "test client",
2546-
version: "1.0",
2547-
},
2548-
{
2549-
capabilities: {
2550-
resources: {},
2551-
},
2552-
},
2553-
);
2458+
const client = new Client({
2459+
name: "test client",
2460+
version: "1.0",
2461+
});
25542462

25552463
let receivedRequestId: string | number | undefined;
25562464
mcpServer.resource("request-id-test", "test://resource", async (_uri, extra) => {
@@ -3052,17 +2960,10 @@ describe("prompt()", () => {
30522960
version: "1.0",
30532961
});
30542962

3055-
const client = new Client(
3056-
{
3057-
name: "test client",
3058-
version: "1.0",
3059-
},
3060-
{
3061-
capabilities: {
3062-
prompts: {},
3063-
},
3064-
},
3065-
);
2963+
const client = new Client({
2964+
name: "test client",
2965+
version: "1.0",
2966+
});
30662967

30672968
mcpServer.prompt(
30682969
"test",
@@ -3258,17 +3159,10 @@ describe("prompt()", () => {
32583159
version: "1.0",
32593160
});
32603161

3261-
const client = new Client(
3262-
{
3263-
name: "test client",
3264-
version: "1.0",
3265-
},
3266-
{
3267-
capabilities: {
3268-
prompts: {},
3269-
},
3270-
},
3271-
);
3162+
const client = new Client({
3163+
name: "test client",
3164+
version: "1.0",
3165+
});
32723166

32733167
mcpServer.prompt("test-prompt", async () => ({
32743168
messages: [
@@ -3312,17 +3206,10 @@ describe("prompt()", () => {
33123206
version: "1.0",
33133207
});
33143208

3315-
const client = new Client(
3316-
{
3317-
name: "test client",
3318-
version: "1.0",
3319-
},
3320-
{
3321-
capabilities: {
3322-
prompts: {},
3323-
},
3324-
},
3325-
);
3209+
const client = new Client({
3210+
name: "test client",
3211+
version: "1.0",
3212+
});
33263213

33273214
mcpServer.prompt(
33283215
"test-prompt",
@@ -3380,17 +3267,10 @@ describe("prompt()", () => {
33803267
version: "1.0",
33813268
});
33823269

3383-
const client = new Client(
3384-
{
3385-
name: "test client",
3386-
version: "1.0",
3387-
},
3388-
{
3389-
capabilities: {
3390-
prompts: {},
3391-
},
3392-
},
3393-
);
3270+
const client = new Client({
3271+
name: "test client",
3272+
version: "1.0",
3273+
});
33943274

33953275
mcpServer.prompt(
33963276
"test-prompt",
@@ -3450,17 +3330,10 @@ describe("prompt()", () => {
34503330
version: "1.0",
34513331
});
34523332

3453-
const client = new Client(
3454-
{
3455-
name: "test client",
3456-
version: "1.0",
3457-
},
3458-
{
3459-
capabilities: {
3460-
prompts: {},
3461-
},
3462-
},
3463-
);
3333+
const client = new Client({
3334+
name: "test client",
3335+
version: "1.0",
3336+
});
34643337

34653338
let receivedRequestId: string | number | undefined;
34663339
mcpServer.prompt("request-id-test", async (extra) => {

0 commit comments

Comments
 (0)