Fix tests

Author: mrubens

src/services/marketplace/__tests__/marketplace-setting-check.spec.ts

@@ -6,21 +6,22 @@ import { webviewMessageHandler } from "../../../core/webview/webviewMessageHandl
 const mockProvider = {
 	getState: vi.fn(),
 	postStateToWebview: vi.fn(),
+	postMessageToWebview: vi.fn(),
 } as any
 
 const mockMarketplaceManager = {
 	updateWithFilteredItems: vi.fn(),
 } as any
 
-describe("Marketplace Setting Check", () => {
+describe("Marketplace General Availability", () => {
 	beforeEach(() => {
 		vi.clearAllMocks()
 	})
 
-	it("should skip API calls when marketplace is disabled", async () => {
-		// Mock experiments with marketplace disabled
+	it("should allow marketplace API calls (marketplace is generally available)", async () => {
+		// Mock state without marketplace experiment (since it's now generally available)
 		mockProvider.getState.mockResolvedValue({
-			experiments: { marketplace: false },
+			experiments: {},
 		})
 
 		const message = {
@@ -30,25 +31,7 @@ describe("Marketplace Setting Check", () => {
 
 		await webviewMessageHandler(mockProvider, message, mockMarketplaceManager)
 
-		// Should not call marketplace manager methods
-		expect(mockMarketplaceManager.updateWithFilteredItems).not.toHaveBeenCalled()
-		expect(mockProvider.postStateToWebview).not.toHaveBeenCalled()
-	})
-
-	it("should allow API calls when marketplace is enabled", async () => {
-		// Mock experiments with marketplace enabled
-		mockProvider.getState.mockResolvedValue({
-			experiments: { marketplace: true },
-		})
-
-		const message = {
-			type: "filterMarketplaceItems" as const,
-			filters: { type: "mcp", search: "", tags: [] },
-		}
-
-		await webviewMessageHandler(mockProvider, message, mockMarketplaceManager)
-
-		// Should call marketplace manager methods
+		// Should call marketplace manager methods since marketplace is generally available
 		expect(mockMarketplaceManager.updateWithFilteredItems).toHaveBeenCalledWith({
 			type: "mcp",
 			search: "",
@@ -57,13 +40,13 @@ describe("Marketplace Setting Check", () => {
 		expect(mockProvider.postStateToWebview).toHaveBeenCalled()
 	})
 
-	it("should skip installation when marketplace is disabled", async () => {
-		// Mock experiments with marketplace disabled
+	it("should allow marketplace installation (marketplace is generally available)", async () => {
+		// Mock state without marketplace experiment (since it's now generally available)
 		mockProvider.getState.mockResolvedValue({
-			experiments: { marketplace: false },
+			experiments: {},
 		})
 
-		const mockInstallMarketplaceItem = vi.fn()
+		const mockInstallMarketplaceItem = vi.fn().mockResolvedValue(undefined)
 		const mockMarketplaceManagerWithInstall = {
 			installMarketplaceItem: mockInstallMarketplaceItem,
 		}
@@ -83,7 +66,7 @@ describe("Marketplace Setting Check", () => {
 
 		await webviewMessageHandler(mockProvider, message, mockMarketplaceManagerWithInstall as any)
 
-		// Should not call install method
-		expect(mockInstallMarketplaceItem).not.toHaveBeenCalled()
+		// Should call install method since marketplace is generally available
+		expect(mockInstallMarketplaceItem).toHaveBeenCalledWith(message.mpItem, message.mpInstallOptions)
 	})
 })

webview-ui/src/__tests__/App.test.tsx

@@ -104,7 +104,7 @@ describe("App", () => {
 			didHydrateState: true,
 			showWelcome: false,
 			shouldShowAnnouncement: false,
-			experiments: { marketplace: false },
+			experiments: {},
 			language: "en",
 		})
 	})
@@ -224,74 +224,35 @@ describe("App", () => {
 		expect(screen.queryByTestId(`${view}-view`)).not.toBeInTheDocument()
 	})
 
-	describe("marketplace experiment", () => {
-		it("does not switch to marketplace tab when experiment is disabled", async () => {
-			mockUseExtensionState.mockReturnValue({
-				didHydrateState: true,
-				showWelcome: false,
-				shouldShowAnnouncement: false,
-				experiments: { marketplace: false },
-				language: "en",
-			})
-
-			render(<AppWithProviders />)
-
-			act(() => {
-				triggerMessage("marketplaceButtonClicked")
-			})
-
-			// Should remain on chat view
-			const chatView = screen.getByTestId("chat-view")
-			expect(chatView.getAttribute("data-hidden")).toBe("false")
-			expect(screen.queryByTestId("marketplace-view")).not.toBeInTheDocument()
-		})
-
-		it("switches to marketplace tab when experiment is enabled", async () => {
-			mockUseExtensionState.mockReturnValue({
-				didHydrateState: true,
-				showWelcome: false,
-				shouldShowAnnouncement: false,
-				experiments: { marketplace: true },
-				language: "en",
-			})
-
-			render(<AppWithProviders />)
-
-			act(() => {
-				triggerMessage("marketplaceButtonClicked")
-			})
-
-			const marketplaceView = await screen.findByTestId("marketplace-view")
-			expect(marketplaceView).toBeInTheDocument()
+	it("switches to marketplace view when receiving marketplaceButtonClicked action", async () => {
+		render(<AppWithProviders />)
 
-			const chatView = screen.getByTestId("chat-view")
-			expect(chatView.getAttribute("data-hidden")).toBe("true")
+		act(() => {
+			triggerMessage("marketplaceButtonClicked")
 		})
 
-		it("returns to chat view when clicking done in marketplace view", async () => {
-			mockUseExtensionState.mockReturnValue({
-				didHydrateState: true,
-				showWelcome: false,
-				shouldShowAnnouncement: false,
-				experiments: { marketplace: true },
-				language: "en",
-			})
+		const marketplaceView = await screen.findByTestId("marketplace-view")
+		expect(marketplaceView).toBeInTheDocument()
 
-			render(<AppWithProviders />)
+		const chatView = screen.getByTestId("chat-view")
+		expect(chatView.getAttribute("data-hidden")).toBe("true")
+	})
 
-			act(() => {
-				triggerMessage("marketplaceButtonClicked")
-			})
+	it("returns to chat view when clicking done in marketplace view", async () => {
+		render(<AppWithProviders />)
 
-			const marketplaceView = await screen.findByTestId("marketplace-view")
+		act(() => {
+			triggerMessage("marketplaceButtonClicked")
+		})
 
-			act(() => {
-				marketplaceView.click()
-			})
+		const marketplaceView = await screen.findByTestId("marketplace-view")
 
-			const chatView = screen.getByTestId("chat-view")
-			expect(chatView.getAttribute("data-hidden")).toBe("false")
-			expect(screen.queryByTestId("marketplace-view")).not.toBeInTheDocument()
+		act(() => {
+			marketplaceView.click()
 		})
+
+		const chatView = screen.getByTestId("chat-view")
+		expect(chatView.getAttribute("data-hidden")).toBe("false")
+		expect(screen.queryByTestId("marketplace-view")).not.toBeInTheDocument()
 	})
 })