Skip to content

Commit 691d35b

Browse files
committed
Use vitest browser mode for view tests
1 parent 9c9b237 commit 691d35b

32 files changed

+813
-404
lines changed

extensions/ql-vscode/package-lock.json

Lines changed: 678 additions & 86 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extensions/ql-vscode/package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1943,7 +1943,7 @@
19431943
"watch": "gulp watch",
19441944
"test": "npm-run-all test:*",
19451945
"test:unit": "cross-env TZ=UTC LANG=en-US jest --projects test/unit-tests",
1946-
"test:view": "jest --projects src/view",
1946+
"test:view": "vitest run --dir src/view",
19471947
"test:vscode-integration": "npm-run-all test:vscode-integration:*",
19481948
"test:vscode-integration:activated-extension": "jest --projects test/vscode-tests/activated-extension",
19491949
"test:vscode-integration:no-workspace": "jest --projects test/vscode-tests/no-workspace",
@@ -2055,6 +2055,8 @@
20552055
"@types/yauzl": "^2.10.3",
20562056
"@typescript-eslint/eslint-plugin": "^8.30.1",
20572057
"@typescript-eslint/parser": "^8.30.1",
2058+
"@vitejs/plugin-react": "^4.4.1",
2059+
"@vitest/browser": "^3.1.2",
20582060
"@vscode/test-electron": "^2.3.9",
20592061
"@vscode/vsce": "^3.2.1",
20602062
"ansi-colors": "^4.1.1",
@@ -2100,7 +2102,8 @@
21002102
"typescript": "^5.6.2",
21012103
"typescript-plugin-css-modules": "^5.1.0",
21022104
"vite": "^6.2.6",
2103-
"vite-node": "^3.0.7"
2105+
"vite-node": "^3.0.7",
2106+
"vitest": "^3.1.2"
21042107
},
21052108
"lint-staged": {
21062109
"./**/*.{json,css,scss}": [

extensions/ql-vscode/src/view/common/SuggestBox/__tests__/SuggestBox.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ const options: TestOption[] = [
7777
];
7878

7979
describe("SuggestBox", () => {
80-
const onChange = jest.fn();
81-
const parseValueToTokens = jest.fn();
80+
const onChange = vi.fn();
81+
const parseValueToTokens = vi.fn();
8282
const render = (props?: Partial<SuggestBoxProps<TestOption>>) =>
8383
reactRender(
8484
<SuggestBox

extensions/ql-vscode/src/view/common/SuggestBox/__tests__/useEffectEvent.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { useEffectEvent } from "../useEffectEvent";
33

44
describe("useEffectEvent", () => {
55
it("does not change reference when changing the callback function", () => {
6-
const callback1 = jest.fn();
7-
const callback2 = jest.fn();
6+
const callback1 = vi.fn();
7+
const callback2 = vi.fn();
88

99
const { result, rerender } = renderHook(
1010
(callback) => useEffectEvent(callback),

extensions/ql-vscode/src/view/common/SuggestBox/__tests__/useOpenKey.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { mockedObject } from "../../../../../test/mocked-object";
55
import { useOpenKey } from "../useOpenKey";
66

77
describe("useOpenKey", () => {
8-
const onOpenChange = jest.fn();
8+
const onOpenChange = vi.fn();
99

1010
beforeEach(() => {
1111
onOpenChange.mockReset();
@@ -41,7 +41,7 @@ describe("useOpenKey", () => {
4141
ctrlKey = false,
4242
metaKey = false,
4343
shiftKey = false,
44-
preventDefault = jest.fn(),
44+
preventDefault = vi.fn(),
4545
}: Partial<KeyboardEvent>) =>
4646
mockedObject<KeyboardEvent>({
4747
key,
@@ -183,7 +183,7 @@ describe("useOpenKey", () => {
183183
rerender(
184184
mockedObject<FloatingContext>({
185185
open: true,
186-
onOpenChange: jest.fn(),
186+
onOpenChange: vi.fn(),
187187
}),
188188
);
189189

extensions/ql-vscode/src/view/jest-environment-jsdom.ts

Lines changed: 0 additions & 15 deletions
This file was deleted.

extensions/ql-vscode/src/view/jest.config.ts

Lines changed: 0 additions & 203 deletions
This file was deleted.

extensions/ql-vscode/src/view/jest.setup.ts

Lines changed: 0 additions & 41 deletions
This file was deleted.

extensions/ql-vscode/src/view/method-modeling/__tests__/MethodModeling.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ describe(MethodModeling.name, () => {
1313
it("renders method modeling panel", () => {
1414
const method = createMethod();
1515
const modeledMethod = createSinkModeledMethod();
16-
const onChange = jest.fn();
16+
const onChange = vi.fn();
1717

1818
render({
1919
language: QueryLanguage.Java,

extensions/ql-vscode/src/view/method-modeling/__tests__/MethodModelingInputs.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe(MethodModelingInputs.name, () => {
1919
const method = createMethod();
2020
const modeledMethod = createSinkModeledMethod();
2121
const modelConfig = defaultModelConfig;
22-
const onChange = jest.fn();
22+
const onChange = vi.fn();
2323

2424
it("renders the method modeling inputs", () => {
2525
render({

extensions/ql-vscode/src/view/method-modeling/__tests__/MultipleModeledMethodsPanel.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { defaultModelConfig } from "../../../model-editor/languages";
1515
describe(MultipleModeledMethodsPanel.name, () => {
1616
const language = QueryLanguage.Java;
1717
const method = createMethod();
18-
const onChange = jest.fn<void, [string, ModeledMethod[]]>();
18+
const onChange = vi.fn<void, [string, ModeledMethod[]]>();
1919
const modelConfig = defaultModelConfig;
2020

2121
const baseProps = {

extensions/ql-vscode/src/view/model-editor/__tests__/LibraryRow.spec.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import { createMockModelEditorViewState } from "../../../../test/factories/model
77

88
describe(LibraryRow.name, () => {
99
const method = createMethod();
10-
const onChange = jest.fn();
11-
const onMethodClick = jest.fn();
12-
const onSaveModelClick = jest.fn();
13-
const onModelDependencyClick = jest.fn();
10+
const onChange = vi.fn();
11+
const onMethodClick = vi.fn();
12+
const onSaveModelClick = vi.fn();
13+
const onModelDependencyClick = vi.fn();
1414

1515
const viewState = createMockModelEditorViewState();
1616

@@ -40,7 +40,7 @@ describe(LibraryRow.name, () => {
4040
onChange={onChange}
4141
onMethodClick={onMethodClick}
4242
onSaveModelClick={onSaveModelClick}
43-
onGenerateFromSourceClick={jest.fn()}
43+
onGenerateFromSourceClick={vi.fn()}
4444
onModelDependencyClick={onModelDependencyClick}
4545
{...props}
4646
/>,

0 commit comments

Comments
 (0)