Revert "Skip failing e2e tests temporarily"

tingwai · tingwai · commit 514c3606689d · 2025-11-13T17:28:33.000-08:00
This reverts commit 140fa2e.
diff --git a/extensions/cli/src/hubLoader.test.ts b/extensions/cli/src/hubLoader.test.ts
@@ -32,40 +32,6 @@ vi.mock("jszip", () => ({
 
 const mockedJSZip = vi.fn();
 
-const TRANSIENT_HUB_ERROR = /HTTP 5\d{2}|network|ECONNRESET|ENETUNREACH/i;
-const RETRY_DELAY_MS = 1000;
-const MAX_RETRY_ATTEMPTS = 2;
-
-async function loadHubResourceWithRetry<T>(
-  loader: () => Promise<T>,
-  retries = MAX_RETRY_ATTEMPTS,
-): Promise<T> {
-  let lastError: unknown;
-
-  for (let attempt = 0; attempt <= retries; attempt++) {
-    try {
-      return await loader();
-    } catch (error) {
-      lastError = error;
-      const message =
-        typeof error === "string"
-          ? error
-          : error instanceof Error
-            ? error.message
-            : "";
-
-      if (!TRANSIENT_HUB_ERROR.test(message) || attempt === retries) {
-        throw error;
-      }
-
-      const backoff = RETRY_DELAY_MS * (attempt + 1);
-      await new Promise((resolve) => setTimeout(resolve, backoff));
-    }
-  }
-
-  throw lastError;
-}
-
 describe("hubLoader", () => {
   beforeEach(async () => {
     vi.clearAllMocks();
@@ -380,8 +346,9 @@ describe("hubLoader", () => {
     });
 
     it("should load rule from real hub: sanity/sanity-opinionated", async () => {
-      const result = await loadHubResourceWithRetry(() =>
-        loadPackageFromHub("sanity/sanity-opinionated", ruleProcessor),
+      const result = await loadPackageFromHub(
+        "sanity/sanity-opinionated",
+        ruleProcessor,
       );
 
       expect(result).toBeDefined();
@@ -397,9 +364,7 @@ describe("hubLoader", () => {
       vi.unmock("jszip");
 
       const testSlug = "upstash/context7-mcp";
-      const result = await loadHubResourceWithRetry(() =>
-        loadPackageFromHub(testSlug, mcpProcessor),
-      );
+      const result = await loadPackageFromHub(testSlug, mcpProcessor);
 
       expect(result).toBeDefined();
       expect(typeof result).toBe("object");
@@ -417,9 +382,7 @@ describe("hubLoader", () => {
       vi.unmock("jszip");
 
       const testSlug = "openai/gpt-5";
-      const result = await loadHubResourceWithRetry(() =>
-        loadPackageFromHub(testSlug, modelProcessor),
-      );
+      const result = await loadPackageFromHub(testSlug, modelProcessor);
 
       expect(result).toBeDefined();
       expect(typeof result).toBe("object");
@@ -434,8 +397,9 @@ describe("hubLoader", () => {
     }, 30000);
 
     it("should load prompt from real hub: launchdarkly/using-flags", async () => {
-      const result = await loadHubResourceWithRetry(() =>
-        loadPackageFromHub("launchdarkly/using-flags", promptProcessor),
+      const result = await loadPackageFromHub(
+        "launchdarkly/using-flags",
+        promptProcessor,
       );
 
       expect(result).toBeDefined();
diff --git a/extensions/cli/src/ui/__tests__/TUIChat.editMessage.test.tsx b/extensions/cli/src/ui/__tests__/TUIChat.editMessage.test.tsx
@@ -1,8 +1,4 @@
 import { testBothModes, renderInMode } from "./TUIChat.dualModeHelper.js";
-import {
-  waitForFrameToContain,
-  waitForFrameToNotContain,
-} from "./TUIChat.testHelper.js";
 
 /**
  * Integration tests for the message edit feature in TUIChat
@@ -20,10 +16,9 @@ describe("TUIChat - Message Edit Feature", () => {
     const { lastFrame, stdin } = renderInMode(mode);
 
     // Verify selector is not open initially
-    let frame = await waitForFrameToNotContain(
-      lastFrame,
-      "No user messages to edit",
-    );
+    let frame = lastFrame();
+    expect(frame).toBeDefined();
+    expect(frame).not.toContain("No user messages to edit");
 
     // Press Esc twice quickly (within 500ms)
     stdin.write("\u001b"); // First Esc
@@ -33,7 +28,9 @@ describe("TUIChat - Message Edit Feature", () => {
     await new Promise((resolve) => setTimeout(resolve, 100));
 
     // Verify selector is now open
-    frame = await waitForFrameToContain(lastFrame, "No user messages to edit");
+    frame = lastFrame();
+    expect(frame).toBeDefined();
+    expect(frame).toContain("No user messages to edit");
   });
 
   testBothModes("edit selector should handle navigation", async (mode) => {
@@ -45,10 +42,9 @@ describe("TUIChat - Message Edit Feature", () => {
     await new Promise((resolve) => setTimeout(resolve, 100));
 
     // Verify selector is open
-    let frame = await waitForFrameToContain(
-      lastFrame,
-      "No user messages to edit",
-    );
+    let frame = lastFrame();
+    expect(frame).toBeDefined();
+    expect(frame).toContain("No user messages to edit");
 
     // Try navigation keys
     stdin.write("j"); // Down
@@ -58,7 +54,9 @@ describe("TUIChat - Message Edit Feature", () => {
     await new Promise((resolve) => setTimeout(resolve, 50));
 
     // Verify selector is still open after navigation
-    frame = await waitForFrameToContain(lastFrame, "No user messages to edit");
+    frame = lastFrame();
+    expect(frame).toBeDefined();
+    expect(frame).toContain("No user messages to edit");
   });
 
   testBothModes("edit selector should exit with Esc", async (mode) => {
@@ -70,20 +68,18 @@ describe("TUIChat - Message Edit Feature", () => {
     await new Promise((resolve) => setTimeout(resolve, 100));
 
     // Verify edit selector is open
-    let frame = await waitForFrameToContain(
-      lastFrame,
-      "No user messages to edit",
-    );
+    let frame = lastFrame();
+    expect(frame).toBeDefined();
+    expect(frame).toContain("No user messages to edit");
 
     // Press Esc to exit
     stdin.write("\u001b");
     await new Promise((resolve) => setTimeout(resolve, 100));
 
     // Verify edit selector is closed
-    frame = await waitForFrameToNotContain(
-      lastFrame,
-      "No user messages to edit",
-    );
+    frame = lastFrame();
+    expect(frame).toBeDefined();
+    expect(frame).not.toContain("No user messages to edit");
   });
 
   testBothModes("should handle edit flow without crashing", async (mode) => {
@@ -126,25 +122,22 @@ describe("TUIChat - Message Edit Feature", () => {
       await new Promise((resolve) => setTimeout(resolve, 100));
 
       // Verify selector opened
-      let frame = await waitForFrameToContain(
-        lastFrame,
-        "No user messages to edit",
-      );
+      let frame = lastFrame();
+      expect(frame).toBeDefined();
+      expect(frame).toContain("No user messages to edit");
 
       stdin.write("k"); // Navigate (no-op with 0 messages)
       await new Promise((resolve) => setTimeout(resolve, 50));
 
       stdin.write("\u001b"); // Close
       await new Promise((resolve) => setTimeout(resolve, 100));
 
-      frame = await waitForFrameToNotContain(
-        lastFrame,
-        "No user messages to edit",
-      );
+      frame = lastFrame();
 
       // UI should remain stable and edit selector should be closed
       expect(frame).toBeDefined();
       expect(frame!.length).toBeGreaterThan(0);
+      expect(frame).not.toContain("No user messages to edit");
     },
   );
 });
@@ -214,19 +207,17 @@ describe("TUIChat - Edit Feature Edge Cases", () => {
     await new Promise((resolve) => setTimeout(resolve, 600)); // Wait longer than 500ms threshold
 
     // Verify selector did not open
-    let frame = await waitForFrameToNotContain(
-      lastFrame,
-      "No user messages to edit",
-    );
+    let frame = lastFrame();
+    expect(frame).toBeDefined();
+    expect(frame).not.toContain("No user messages to edit");
 
     stdin.write("\u001b"); // Another single Esc after timeout
     await new Promise((resolve) => setTimeout(resolve, 100));
 
     // Verify selector still did not open
-    frame = await waitForFrameToNotContain(
-      lastFrame,
-      "No user messages to edit",
-    );
+    frame = lastFrame();
+    expect(frame).toBeDefined();
+    expect(frame).not.toContain("No user messages to edit");
   });
 
   testBothModes(
diff --git a/extensions/cli/src/ui/__tests__/TUIChat.fileSearch.test.tsx b/extensions/cli/src/ui/__tests__/TUIChat.fileSearch.test.tsx
@@ -1,8 +1,5 @@
 import { renderInMode, testSingleMode } from "./TUIChat.dualModeHelper.js";
-import {
-  waitForFrameToContain,
-  waitForNextRender,
-} from "./TUIChat.testHelper.js";
+import { waitForNextRender } from "./TUIChat.testHelper.js";
 
 describe("TUIChat - @ File Search Tests", () => {
   testSingleMode("shows @ character when user types @", "local", async () => {
@@ -37,9 +34,13 @@ describe("TUIChat - @ File Search Tests", () => {
       // Type @ followed by text to filter files
       stdin.write("@READ");
 
-      const frame = await waitForFrameToContain(lastFrame, "@READ", {
-        timeout: 2000,
-      });
+      // Wait for file search to filter and display results
+      await new Promise((resolve) => setTimeout(resolve, 500));
+
+      const frame = lastFrame()!;
+
+      // Should show the typed text
+      expect(frame).toContain("@READ");
 
       // Should show either navigation hints or at least indicate file search is working
       const hasNavigationHints = frame.includes("↑/↓ to navigate");
diff --git a/extensions/cli/src/ui/__tests__/TUIChat.testHelper.ts b/extensions/cli/src/ui/__tests__/TUIChat.testHelper.ts
@@ -436,57 +436,6 @@ export async function waitForNextRender(): Promise<void> {
   await new Promise((resolve) => setTimeout(resolve, 500));
 }
 
-export interface WaitForFrameOptions {
-  timeout?: number;
-  interval?: number;
-}
-
-export async function waitForFrameCondition(
-  lastFrame: () => string | undefined,
-  predicate: (frame: string) => boolean,
-  { timeout = 2000, interval = 50 }: WaitForFrameOptions = {},
-): Promise<string> {
-  const start = Date.now();
-  let frame = lastFrame();
-
-  while (Date.now() - start <= timeout) {
-    if (frame && predicate(frame)) {
-      return frame;
-    }
-
-    await new Promise((resolve) => setTimeout(resolve, interval));
-    frame = lastFrame();
-  }
-
-  throw new Error(
-    `Condition not met within ${timeout}ms. Last frame:\n${frame ?? "<undefined>"}`,
-  );
-}
-
-export function waitForFrameToContain(
-  lastFrame: () => string | undefined,
-  text: string,
-  options?: WaitForFrameOptions,
-): Promise<string> {
-  return waitForFrameCondition(
-    lastFrame,
-    (frame) => frame.includes(text),
-    options,
-  );
-}
-
-export function waitForFrameToNotContain(
-  lastFrame: () => string | undefined,
-  text: string,
-  options?: WaitForFrameOptions,
-): Promise<string> {
-  return waitForFrameCondition(
-    lastFrame,
-    (frame) => !frame.includes(text),
-    options,
-  );
-}
-
 /**
  * Helper to check if UI shows remote mode indicators
  */
diff --git a/extensions/vscode/e2e/tests/Autocomplete.test.ts b/extensions/vscode/e2e/tests/Autocomplete.test.ts
@@ -5,7 +5,7 @@ import { AutocompleteActions } from "../actions/Autocomplete.actions";
 import { GlobalActions } from "../actions/Global.actions";
 import { DEFAULT_TIMEOUT } from "../constants";
 
-describe.skip("Autocomplete", () => {
+describe("Autocomplete", () => {
   let editor: TextEditor;
 
   before(async function () {
diff --git a/extensions/vscode/e2e/tests/Edit.test.ts b/extensions/vscode/e2e/tests/Edit.test.ts
@@ -13,7 +13,7 @@ import { DEFAULT_TIMEOUT } from "../constants";
 import { GUISelectors } from "../selectors/GUI.selectors";
 import { TestUtils } from "../TestUtils";
 
-describe.skip("Edit Test", () => {
+describe("Edit Test", () => {
   let view: WebView;
   let editor: TextEditor;
   let originalEditorText = "Hello world!";
diff --git a/extensions/vscode/e2e/tests/KeyboardShortcuts.test.ts b/extensions/vscode/e2e/tests/KeyboardShortcuts.test.ts
@@ -19,7 +19,7 @@ import { DEFAULT_TIMEOUT } from "../constants";
 import { GUISelectors } from "../selectors/GUI.selectors";
 import { TestUtils } from "../TestUtils";
 
-describe.skip("Keyboard Shortcuts", () => {
+describe("Keyboard Shortcuts", () => {
   let driver: WebDriver;
   let editor: TextEditor;
   let view: WebView;
diff --git a/extensions/vscode/e2e/tests/PromptFile.test.ts b/extensions/vscode/e2e/tests/PromptFile.test.ts
@@ -10,7 +10,7 @@ import {
 import { GlobalActions } from "../actions/Global.actions";
 import { DEFAULT_TIMEOUT } from "../constants";
 
-describe.skip("Prompt file", () => {
+describe("Prompt file", () => {
   let editor: TextEditor;
 
   before(async function () {
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
@@ -680,8 +680,8 @@
     "e2e:compile": "tsc -p ./tsconfig.e2e.json",
     "e2e:build": "npm --prefix ../../gui run build && npm run package",
     "e2e:create-storage": "mkdir -p ./e2e/storage",
-    "e2e:get-chromedriver": "extest get-chromedriver --storage ./e2e/storage --code_version 1.95.0",
-    "e2e:get-vscode": "extest get-vscode --storage ./e2e/storage --code_version 1.95.0",
+    "e2e:get-chromedriver": "extest get-chromedriver --storage ./e2e/storage --code_version 1.92.2",
+    "e2e:get-vscode": "extest get-vscode --storage ./e2e/storage --code_version 1.92.2",
     "e2e:sign-vscode": "codesign --entitlements entitlements.plist --deep --force -s - './e2e/storage/Visual Studio Code.app'",
     "e2e:copy-vsix": "chmod +x ./e2e/get-latest-vsix.sh && bash ./e2e/get-latest-vsix.sh",
     "e2e:install-vsix": "extest install-vsix -f ./e2e/vsix/continue.vsix --extensions_dir ./e2e/.test-extensions --storage ./e2e/storage",
