Refactor e2e test fixture creation

Author: ishulgin

src/__tests__/CodexACPAgent/e2e/acp-e2e-file-approval.test.ts

@@ -1,10 +1,11 @@
 import fs from "node:fs";
 import path from "node:path";
 import {afterEach, beforeEach, expect, it} from "vitest";
+import {AgentMode} from "../../../AgentMode";
 import {ApprovalOptionId} from "../../../ApprovalOptionId";
 import {
+    createAuthenticatedFixture,
     createPermissionResponder,
-    createReadOnlyFixture,
     describeE2E,
     type SpawnedAgentFixture,
 } from "./acp-e2e-test-utils";
@@ -17,7 +18,7 @@ describeE2E("E2E file approval tests", () => {
     let sessionId: string;
 
     beforeEach(async () => {
-        fixture = await createReadOnlyFixture();
+        fixture = await createAuthenticatedFixture(AgentMode.ReadOnly);
         sessionId = (await fixture.createSession()).sessionId;
     });
 

src/__tests__/CodexACPAgent/e2e/acp-e2e-shell-approval.test.ts

@@ -1,12 +1,12 @@
 import fs from "node:fs";
 import path from "node:path";
 import {afterEach, beforeEach, expect, it, vi} from "vitest";
+import {AgentMode} from "../../../AgentMode";
 import {ApprovalOptionId} from "../../../ApprovalOptionId";
 import {
     createAuthenticatedFixture,
     createPermissionResponse,
     createPermissionResponder,
-    createReadOnlyFixture,
     describeE2E,
     expectEndTurn,
     type SpawnedAgentFixture,
@@ -21,7 +21,7 @@ describeE2E("E2E shell approval tests", () => {
     let sessionId: string;
 
     beforeEach(async () => {
-        fixture = await createReadOnlyFixture();
+        fixture = await createAuthenticatedFixture(AgentMode.ReadOnly);
         sessionId = (await fixture.createSession()).sessionId;
     });
 

src/__tests__/CodexACPAgent/e2e/acp-e2e-test-utils.ts

@@ -26,8 +26,9 @@ export function expectEndTurn(response: acp.PromptResponse): void {
     expect(response.stopReason).toBe("end_turn");
 }
 
-export async function createAuthenticatedFixture(extraEnv?: NodeJS.ProcessEnv): Promise<SpawnedAgentFixture> {
+export async function createAuthenticatedFixture(initialMode?: AgentMode): Promise<SpawnedAgentFixture> {
     const apiKey = requireLiveApiKey();
+    const extraEnv = initialMode ? {INITIAL_AGENT_MODE: initialMode.id} : undefined;
     return await createSpawnedFixture(async (connection, authMethods) => {
         if (!authMethods.some((method) => method.id === "api-key")) {
             throw new Error("API key authentication is not available.");
@@ -49,10 +50,6 @@ export async function createAuthenticatedFixture(extraEnv?: NodeJS.ProcessEnv):
     }, extraEnv);
 }
 
-export async function createReadOnlyFixture(): Promise<SpawnedAgentFixture> {
-    return await createAuthenticatedFixture({INITIAL_AGENT_MODE: AgentMode.ReadOnly.id});
-}
-
 export async function createGatewayFixture(
     baseUrl: string,
     headers: Record<string, string>,

src/__tests__/CodexACPAgent/e2e/acp-e2e.test.ts

@@ -79,9 +79,7 @@ describeE2E("E2E tests", () => {
 
     it("respects INITIAL_AGENT_MODE when seeding the initial session mode", async () => {
         const initialMode = AgentMode.ReadOnly;
-        fixture = await createAuthenticatedFixture({
-            INITIAL_AGENT_MODE: initialMode.id,
-        });
+        fixture = await createAuthenticatedFixture(initialMode);
         const session = await fixture.createSession();
 
         expect(session.modes?.currentModeId).toBe(initialMode.id);