Skip to content

Commit 03db526

Browse files
zoomote[bot]roomote
andauthored
refactor: reuse webview render helper in remaining settings specs (#1204)
Co-authored-by: Roomote <roomote@roomote.dev>
1 parent 20dd966 commit 03db526

4 files changed

Lines changed: 105 additions & 192 deletions

File tree

‎webview-ui/src/components/settings/__tests__/ModelPicker.deprecated.spec.tsx‎

Lines changed: 58 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
// npx vitest src/components/settings/__tests__/ModelPicker.deprecated.spec.tsx
22

3-
import { render, screen } from "@testing-library/react"
3+
import { screen } from "@testing-library/react"
4+
5+
import { renderWithExtensionState } from "@/utils/test-utils"
46
import userEvent from "@testing-library/user-event"
5-
import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
7+
import { QueryClient } from "@tanstack/react-query"
68
import { describe, it, expect, vi, beforeEach } from "vitest"
79

810
import { ModelPicker } from "../ModelPicker"
@@ -88,19 +90,18 @@ describe("ModelPicker - Deprecated Models", () => {
8890
it("should filter out deprecated models from the dropdown", async () => {
8991
const user = userEvent.setup()
9092

91-
render(
92-
<QueryClientProvider client={queryClient}>
93-
<ModelPicker
94-
defaultModelId="model-1"
95-
models={regularModels}
96-
modelIdKey="openRouterModelId"
97-
serviceName="Test Service"
98-
serviceUrl="https://test.com"
99-
apiConfiguration={{ apiProvider: "openrouter" }}
100-
setApiConfigurationField={mockSetApiConfigurationField}
101-
organizationAllowList={{ allowAll: true, providers: {} }}
102-
/>
103-
</QueryClientProvider>,
93+
renderWithExtensionState(
94+
<ModelPicker
95+
defaultModelId="model-1"
96+
models={regularModels}
97+
modelIdKey="openRouterModelId"
98+
serviceName="Test Service"
99+
serviceUrl="https://test.com"
100+
apiConfiguration={{ apiProvider: "openrouter" }}
101+
setApiConfigurationField={mockSetApiConfigurationField}
102+
organizationAllowList={{ allowAll: true, providers: {} }}
103+
/>,
104+
{ queryClient },
104105
)
105106

106107
// Open the dropdown
@@ -116,22 +117,21 @@ describe("ModelPicker - Deprecated Models", () => {
116117
})
117118

118119
it("should show error when a deprecated model is currently selected", () => {
119-
render(
120-
<QueryClientProvider client={queryClient}>
121-
<ModelPicker
122-
defaultModelId="deprecated-model"
123-
models={regularModels}
124-
modelIdKey="openRouterModelId"
125-
serviceName="Test Service"
126-
serviceUrl="https://test.com"
127-
apiConfiguration={{
128-
apiProvider: "openrouter",
129-
openRouterModelId: "deprecated-model",
130-
}}
131-
setApiConfigurationField={mockSetApiConfigurationField}
132-
organizationAllowList={{ allowAll: true, providers: {} }}
133-
/>
134-
</QueryClientProvider>,
120+
renderWithExtensionState(
121+
<ModelPicker
122+
defaultModelId="deprecated-model"
123+
models={regularModels}
124+
modelIdKey="openRouterModelId"
125+
serviceName="Test Service"
126+
serviceUrl="https://test.com"
127+
apiConfiguration={{
128+
apiProvider: "openrouter",
129+
openRouterModelId: "deprecated-model",
130+
}}
131+
setApiConfigurationField={mockSetApiConfigurationField}
132+
organizationAllowList={{ allowAll: true, providers: {} }}
133+
/>,
134+
{ queryClient },
135135
)
136136

137137
// Check that the error message is displayed
@@ -143,19 +143,18 @@ describe("ModelPicker - Deprecated Models", () => {
143143
it("should allow selecting non-deprecated models", async () => {
144144
const user = userEvent.setup()
145145

146-
render(
147-
<QueryClientProvider client={queryClient}>
148-
<ModelPicker
149-
defaultModelId="model-1"
150-
models={regularModels}
151-
modelIdKey="openRouterModelId"
152-
serviceName="Test Service"
153-
serviceUrl="https://test.com"
154-
apiConfiguration={{ apiProvider: "openrouter" }}
155-
setApiConfigurationField={mockSetApiConfigurationField}
156-
organizationAllowList={{ allowAll: true, providers: {} }}
157-
/>
158-
</QueryClientProvider>,
146+
renderWithExtensionState(
147+
<ModelPicker
148+
defaultModelId="model-1"
149+
models={regularModels}
150+
modelIdKey="openRouterModelId"
151+
serviceName="Test Service"
152+
serviceUrl="https://test.com"
153+
apiConfiguration={{ apiProvider: "openrouter" }}
154+
setApiConfigurationField={mockSetApiConfigurationField}
155+
organizationAllowList={{ allowAll: true, providers: {} }}
156+
/>,
157+
{ queryClient },
159158
)
160159

161160
// Open the dropdown
@@ -171,22 +170,21 @@ describe("ModelPicker - Deprecated Models", () => {
171170
})
172171

173172
it("should not display model info for deprecated models", () => {
174-
render(
175-
<QueryClientProvider client={queryClient}>
176-
<ModelPicker
177-
defaultModelId="deprecated-model"
178-
models={regularModels}
179-
modelIdKey="openRouterModelId"
180-
serviceName="Test Service"
181-
serviceUrl="https://test.com"
182-
apiConfiguration={{
183-
apiProvider: "openrouter",
184-
openRouterModelId: "deprecated-model",
185-
}}
186-
setApiConfigurationField={mockSetApiConfigurationField}
187-
organizationAllowList={{ allowAll: true, providers: {} }}
188-
/>
189-
</QueryClientProvider>,
173+
renderWithExtensionState(
174+
<ModelPicker
175+
defaultModelId="deprecated-model"
176+
models={regularModels}
177+
modelIdKey="openRouterModelId"
178+
serviceName="Test Service"
179+
serviceUrl="https://test.com"
180+
apiConfiguration={{
181+
apiProvider: "openrouter",
182+
openRouterModelId: "deprecated-model",
183+
}}
184+
setApiConfigurationField={mockSetApiConfigurationField}
185+
organizationAllowList={{ allowAll: true, providers: {} }}
186+
/>,
187+
{ queryClient },
190188
)
191189

192190
// Model info should not be displayed for deprecated models

‎webview-ui/src/components/settings/__tests__/ModelPicker.spec.tsx‎

Lines changed: 20 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
// npx vitest src/components/settings/__tests__/ModelPicker.spec.tsx
22

3-
import { screen, fireEvent, render } from "@/utils/test-utils"
3+
import { screen, fireEvent, renderWithExtensionState } from "@/utils/test-utils"
44
import { act } from "react"
5-
import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
5+
import { QueryClient } from "@tanstack/react-query"
66

77
import { ModelInfo, providerIdentifiers } from "@roo-code/types"
88

99
import { ModelPicker } from "../ModelPicker"
1010

1111
vi.mock("@src/context/ExtensionStateContext", () => ({
12+
ExtensionStateContextProvider: ({ children }: any) => children,
1213
useExtensionState: vi.fn(),
1314
}))
1415

@@ -48,11 +49,7 @@ describe("ModelPicker", () => {
4849
const queryClient = new QueryClient()
4950

5051
const renderModelPicker = () => {
51-
return render(
52-
<QueryClientProvider client={queryClient}>
53-
<ModelPicker {...defaultProps} />
54-
</QueryClientProvider>,
55-
)
52+
return renderWithExtensionState(<ModelPicker {...defaultProps} />, { queryClient })
5653
}
5754

5855
beforeEach(() => {
@@ -154,11 +151,7 @@ describe("ModelPicker", () => {
154151
}
155152

156153
await act(async () => {
157-
render(
158-
<QueryClientProvider client={queryClient}>
159-
<ModelPicker {...propsWithError} />
160-
</QueryClientProvider>,
161-
)
154+
renderWithExtensionState(<ModelPicker {...propsWithError} />, { queryClient })
162155
})
163156

164157
// Check that the error message is displayed
@@ -181,11 +174,7 @@ describe("ModelPicker", () => {
181174
}
182175

183176
await act(async () => {
184-
render(
185-
<QueryClientProvider client={queryClient}>
186-
<ModelPicker {...propsWithError} />
187-
</QueryClientProvider>,
188-
)
177+
renderWithExtensionState(<ModelPicker {...propsWithError} />, { queryClient })
189178
})
190179

191180
// Check that both the model selector and error message are present
@@ -203,22 +192,17 @@ describe("ModelPicker", () => {
203192
const initialError = "Initial error"
204193
const updatedError = "Updated error"
205194

206-
const { rerender } = render(
207-
<QueryClientProvider client={queryClient}>
208-
<ModelPicker {...defaultProps} errorMessage={initialError} />
209-
</QueryClientProvider>,
195+
const { rerender } = renderWithExtensionState(
196+
<ModelPicker {...defaultProps} errorMessage={initialError} />,
197+
{ queryClient },
210198
)
211199

212200
// Check initial error is displayed
213201
expect(screen.getByTestId("api-error-message")).toBeInTheDocument()
214202
expect(screen.getByText(initialError)).toBeInTheDocument()
215203

216204
// Update the error message
217-
rerender(
218-
<QueryClientProvider client={queryClient}>
219-
<ModelPicker {...defaultProps} errorMessage={updatedError} />
220-
</QueryClientProvider>,
221-
)
205+
rerender(<ModelPicker {...defaultProps} errorMessage={updatedError} />)
222206

223207
// Check that the error message has been updated
224208
expect(screen.getByTestId("api-error-message")).toBeInTheDocument()
@@ -229,22 +213,17 @@ describe("ModelPicker", () => {
229213
it("removes error message when errorMessage prop becomes undefined", async () => {
230214
const errorMessage = "Temporary error"
231215

232-
const { rerender } = render(
233-
<QueryClientProvider client={queryClient}>
234-
<ModelPicker {...defaultProps} errorMessage={errorMessage} />
235-
</QueryClientProvider>,
216+
const { rerender } = renderWithExtensionState(
217+
<ModelPicker {...defaultProps} errorMessage={errorMessage} />,
218+
{ queryClient },
236219
)
237220

238221
// Check error is initially displayed
239222
expect(screen.getByTestId("api-error-message")).toBeInTheDocument()
240223
expect(screen.getByText(errorMessage)).toBeInTheDocument()
241224

242225
// Remove the error message
243-
rerender(
244-
<QueryClientProvider client={queryClient}>
245-
<ModelPicker {...defaultProps} errorMessage={undefined} />
246-
</QueryClientProvider>,
247-
)
226+
rerender(<ModelPicker {...defaultProps} errorMessage={undefined} />)
248227

249228
// Check that the error message has been removed
250229
expect(screen.queryByTestId("api-error-message")).not.toBeInTheDocument()
@@ -255,10 +234,9 @@ describe("ModelPicker", () => {
255234
describe("automaticFetch hint", () => {
256235
it("hides the automatic fetch hint for MiMo provider", async () => {
257236
await act(async () => {
258-
render(
259-
<QueryClientProvider client={queryClient}>
260-
<ModelPicker {...defaultProps} apiConfiguration={{ apiProvider: providerIdentifiers.mimo }} />
261-
</QueryClientProvider>,
237+
renderWithExtensionState(
238+
<ModelPicker {...defaultProps} apiConfiguration={{ apiProvider: providerIdentifiers.mimo }} />,
239+
{ queryClient },
262240
)
263241
})
264242

@@ -267,10 +245,9 @@ describe("ModelPicker", () => {
267245

268246
it("shows the automatic fetch hint for non-MiMo providers", async () => {
269247
await act(async () => {
270-
render(
271-
<QueryClientProvider client={queryClient}>
272-
<ModelPicker {...defaultProps} apiConfiguration={{ apiProvider: providerIdentifiers.openai }} />
273-
</QueryClientProvider>,
248+
renderWithExtensionState(
249+
<ModelPicker {...defaultProps} apiConfiguration={{ apiProvider: providerIdentifiers.openai }} />,
250+
{ queryClient },
274251
)
275252
})
276253

0 commit comments

Comments
 (0)