test(webview): cover Bedrock select binding

Author: WebMad

webview-ui/src/components/chat/CodeIndexPopover.tsx

@@ -88,11 +88,6 @@ interface LocalCodeIndexSettings {
 	codebaseIndexOpenRouterSpecificProvider?: string
 }
 
-export const shouldAutoPopulateBedrockSettings = (
-	embedderProvider: EmbedderProvider,
-	apiProvider: string | undefined,
-): boolean => embedderProvider === providerIdentifiers.bedrock && apiProvider === providerIdentifiers.bedrock
-
 type TranslationCallback = (key: string) => string
 
 // Validation schema for codebase index settings
@@ -732,10 +727,8 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 												// Auto-populate Region and Profile when switching to Bedrock
 												// if the main API provider is also configured for Bedrock
 												if (
-													shouldAutoPopulateBedrockSettings(
-														value,
-														apiConfiguration?.apiProvider,
-													)
+													value === providerIdentifiers.bedrock &&
+													apiConfiguration?.apiProvider === providerIdentifiers.bedrock
 												) {
 													// Only populate if currently empty
 													if (

webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx

@@ -6,7 +6,7 @@ import { providerIdentifiers } from "@roo-code/types"
 import { fireEvent, renderWithExtensionState, screen } from "@/utils/test-utils"
 import { useOpenRouterModelProviders } from "@src/components/ui/hooks/useOpenRouterModelProviders"
 
-import { CodeIndexPopover, createValidationSchema, shouldAutoPopulateBedrockSettings } from "../CodeIndexPopover"
+import { CodeIndexPopover, createValidationSchema } from "../CodeIndexPopover"
 
 vi.mock("@src/components/ui/hooks/useOpenRouterModelProviders", () => ({
 	OPENROUTER_DEFAULT_PROVIDER_NAME: "Auto",
@@ -22,6 +22,24 @@ vi.mock("@src/components/ui", async (importOriginal) => {
 			return <>{children}</>
 		},
 		PopoverContent: ({ children }: React.PropsWithChildren) => <div>{children}</div>,
+		Select: ({
+			children,
+			value,
+			onValueChange,
+		}: React.PropsWithChildren<{
+			value?: string
+			onValueChange?: (value: string) => void
+		}>) => (
+			<select value={value} onChange={(event) => onValueChange?.(event.target.value)}>
+				{children}
+			</select>
+		),
+		SelectTrigger: () => null,
+		SelectValue: () => null,
+		SelectContent: ({ children }: React.PropsWithChildren) => <>{children}</>,
+		SelectItem: ({ children, value }: React.PropsWithChildren<{ value: string }>) => (
+			<option value={value}>{children}</option>
+		),
 	}
 })
 
@@ -95,21 +113,14 @@ describe("CodeIndexPopover validation", () => {
 	})
 })
 
-describe("shouldAutoPopulateBedrockSettings", () => {
-	it("only enables Bedrock defaults when both providers are Bedrock", () => {
-		expect(shouldAutoPopulateBedrockSettings(providerIdentifiers.bedrock, providerIdentifiers.bedrock)).toBe(true)
-		expect(shouldAutoPopulateBedrockSettings(providerIdentifiers.bedrock, providerIdentifiers.anthropic)).toBe(
-			false,
-		)
-		expect(shouldAutoPopulateBedrockSettings(providerIdentifiers.openai, providerIdentifiers.bedrock)).toBe(false)
-		expect(shouldAutoPopulateBedrockSettings(providerIdentifiers.bedrock, undefined)).toBe(false)
-	})
-})
-
 describe("CodeIndexPopover OpenRouter provider lookup", () => {
 	const mockedUseOpenRouterModelProviders = vi.mocked(useOpenRouterModelProviders)
 
-	const renderPopover = (provider: EmbedderProvider, modelId: string) =>
+	const renderPopover = (
+		provider: EmbedderProvider,
+		modelId: string,
+		apiProvider?: ExtensionState["apiConfiguration"],
+	) =>
 		renderWithExtensionState(
 			<CodeIndexPopover indexingStatus={indexingStatus}>
 				<button>Open code index settings</button>
@@ -122,6 +133,7 @@ describe("CodeIndexPopover OpenRouter provider lookup", () => {
 						codebaseIndexEmbedderModelId: modelId,
 					},
 					codebaseIndexModels: {},
+					apiConfiguration: apiProvider,
 					platform: "darwin",
 					arch: "arm64",
 				} as Partial<ExtensionState>,
@@ -169,4 +181,41 @@ describe("CodeIndexPopover OpenRouter provider lookup", () => {
 
 		expect(screen.getByText(label)).toBeInTheDocument()
 	})
+
+	it.each([
+		{
+			name: "matching Bedrock API provider",
+			apiConfiguration: {
+				apiProvider: providerIdentifiers.bedrock,
+				awsRegion: "us-west-2",
+				awsProfile: "development",
+			},
+			expectedRegion: "us-west-2",
+			expectedProfile: "development",
+		},
+		{
+			name: "mismatched API provider",
+			apiConfiguration: {
+				apiProvider: providerIdentifiers.anthropic,
+				awsRegion: "us-west-2",
+				awsProfile: "development",
+			},
+			expectedRegion: "",
+			expectedProfile: "",
+		},
+		{
+			name: "unset API provider",
+			apiConfiguration: undefined,
+			expectedRegion: "",
+			expectedProfile: "",
+		},
+	] as const)("populates Bedrock fields for $name", ({ apiConfiguration, expectedRegion, expectedProfile }) => {
+		renderPopover(providerIdentifiers.openai, "embedding-model", apiConfiguration)
+		fireEvent.click(screen.getByText("settings:codeIndex.setupConfigLabel"))
+
+		fireEvent.change(screen.getAllByRole("combobox")[0], { target: { value: providerIdentifiers.bedrock } })
+
+		expect(screen.getByPlaceholderText("settings:codeIndex.bedrockRegionPlaceholder")).toHaveValue(expectedRegion)
+		expect(screen.getByPlaceholderText("settings:codeIndex.bedrockProfilePlaceholder")).toHaveValue(expectedProfile)
+	})
 })