Skip to content

Commit 2f76c3b

Browse files
egor-baranovslapoguzov
authored andcommitted
Fix tests
1 parent 64b472f commit 2f76c3b

3 files changed

Lines changed: 16 additions & 6 deletions

File tree

src/__tests__/CodexACPAgent/CodexAcpClient.test.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ describe('ACP server test', { timeout: 40_000 }, () => {
6666
const newSessionResponse = await codexAcpAgent.newSession({cwd: "", mcpServers: []});
6767
expect(newSessionResponse.sessionId).toBeDefined()
6868

69-
const transportDump = fixture.getCodexConnectionDump([...ignoredFields, "upgrade"]);
69+
const transportDump = fixture.getCodexConnectionDump(
70+
[...ignoredFields, "upgrade"],
71+
{ ignoreNotificationMethods: ["codex/event/mcp_startup_update"] }
72+
);
7073
await expect(transportDump).toMatchFileSnapshot("data/auth-with-key.json");
7174

7275
const authenticatedResponse = await fixture.getCodexAcpAgent().extMethod("authentication/status", {});
@@ -213,6 +216,7 @@ describe('ACP server test', { timeout: 40_000 }, () => {
213216
fixture.getCodexAppServerClient().onServerNotification = loadNotifications();
214217

215218
const codexAcpAgent = fixture.getCodexAcpAgent();
219+
await codexAcpAgent.initialize({ protocolVersion: 1 });
216220

217221
fixture.getCodexAppServerClient().turnStart = vi.fn().mockResolvedValue({
218222
turn: { id: "turn-id", items: [], status: "inProgress", error: null }

src/__tests__/CodexACPAgent/mcp-session.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ describe('MCP session configuration', { timeout: 40_000 }, () => {
2626
fixture.clearAcpConnectionDump();
2727
await codexAcpAgent.prompt({sessionId: newSessionResponse.sessionId, prompt: [{type: "text", text: "/mcp"}]});
2828
const transportDump = fixture.getAcpConnectionDump([]);
29-
console.log(transportDump)
30-
expect(transportDump).contain("Configured MCP servers:\\n- test-mcp");
29+
expect(transportDump).toContain("Configured MCP servers:");
30+
expect(transportDump).toContain("- test-mcp");
3131
});
3232

3333
});

src/__tests__/acp-test-utils.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export interface TestFixture {
3939
getCodexAcpAgent(): CodexAcpServer,
4040

4141
onCodexConnectionEvent(handler: (event: CodexConnectionEvent) => void): void,
42-
getCodexConnectionDump(ignoredFields: string[]): string,
42+
getCodexConnectionDump(ignoredFields: string[], options?: { ignoreNotificationMethods?: string[] }): string,
4343
clearCodexConnectionDump(): void,
4444

4545
onAcpConnectionEvent(handler: (event: MethodCallEvent) => void): void,
@@ -85,8 +85,14 @@ export function createBaseTestFixture(config: ConnectionConfig): TestFixture {
8585
getCodexAcpClient(): CodexAcpClient {
8686
return codexAcpClient;
8787
},
88-
getCodexConnectionDump(ignoredFields: string[]): string {
89-
return createArrayDump(transportEvents, ignoredFields);
88+
getCodexConnectionDump(ignoredFields: string[], options?: { ignoreNotificationMethods?: string[] }): string {
89+
const ignoredMethods = new Set(options?.ignoreNotificationMethods ?? []);
90+
const filteredEvents = ignoredMethods.size === 0
91+
? transportEvents
92+
: transportEvents.filter((event) =>
93+
!(event.eventType === "notification" && ignoredMethods.has(event.method))
94+
);
95+
return createArrayDump(filteredEvents, ignoredFields);
9096
},
9197
onCodexConnectionEvent(handler: (event: CodexConnectionEvent) => void): void {
9298
codexEventHandlers.push(handler);

0 commit comments

Comments
 (0)