test(mcp-oauth): making tests independant

Author: edelauna

apps/vscode-e2e/src/suite/mcp-oauth.test.ts

@@ -320,12 +320,42 @@ suite("Roo Code MCP OAuth", function () {
 		console.log("[TEST] MCP OAuth flow completed successfully. Endpoints hit:", [...endpointsHit])
 	})
 
+	// Ensure a valid token is stored in SecretStorage. Uses timeout: 45 (not the
+	// McpHub default of 60) so this write always constitutes a config change that
+	// triggers a reconnect, regardless of what previous tests may have set.
+	// Waits for mcp-authed without requiring mcp-401: if no token is cached the
+	// full OAuth flow runs; if a token is already stored it is reused directly.
+	async function ensureOAuthTokenCached() {
+		const workspaceDir = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath || tempDir
+		const mcpConfigPath = path.join(workspaceDir, ".roo", "mcp.json")
+
+		await fs.writeFile(
+			mcpConfigPath,
+			JSON.stringify(
+				{
+					mcpServers: {
+						"test-oauth-server": {
+							type: "streamable-http",
+							url: `http://localhost:${mockServerPort}/mcp`,
+							timeout: 45,
+						},
+					},
+				},
+				null,
+				2,
+			),
+		)
+
+		await waitFor(() => endpointsHit.has("mcp-authed"), { timeout: 45_000 })
+	}
+
 	test("Should reuse stored token on reconnect without re-running the full OAuth flow", async function () {
-		// Test 1 stored a valid token in SecretStorage. The per-test setup already
-		// cleared endpointsHit, so any hits here are from this reconnect only.
 		const workspaceDir = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath || tempDir
 		const mcpConfigPath = path.join(workspaceDir, ".roo", "mcp.json")
 
+		await ensureOAuthTokenCached()
+		endpointsHit.clear()
+
 		// Slightly modify the config to force a reconnect
 		await fs.writeFile(
 			mcpConfigPath,
@@ -350,9 +380,9 @@ suite("Roo Code MCP OAuth", function () {
 		console.log("[TEST] Token reuse: MCP server got authenticated request")
 
 		// The full OAuth flow should NOT have re-run (token was cached in SecretStorage)
-		assert.ok(endpointsHit.has("mcp-authed"), "Reconnect should use cached token")
 		assert.ok(!endpointsHit.has("mcp-401"), "Should not get 401 when token is cached")
 		assert.ok(!endpointsHit.has("register"), "Should not re-register client when token is cached")
+		assert.ok(!endpointsHit.has("token"), "Should not re-exchange token when token is cached")
 
 		console.log("[TEST] Token reuse test passed. Endpoints hit:", [...endpointsHit])
 	})