Skip to content

Commit d10a456

Browse files
manudeliTkDodo
manudeli
and
TkDodo
authored
chore(*): vitest v2 (#7735)
* chore(*): vitest v2 * chore: update * chore: update * chore: update * chore: update --------- Co-authored-by: Dominik Dorfmeister <office@dorfmeister.cc>
1 parent 4635954 commit d10a456

25 files changed

+469
-284
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@types/node": "^20.12.12",
4949
"@types/react": "npm:types-react@rc",
5050
"@types/react-dom": "npm:types-react-dom@rc",
51-
"@vitest/coverage-istanbul": "^1.6.0",
51+
"@vitest/coverage-istanbul": "^2.0.2",
5252
"cpy-cli": "^5.0.0",
5353
"esbuild-plugin-file-path-extensions": "^2.1.0",
5454
"eslint": "^8.57.0",
@@ -75,7 +75,7 @@
7575
"typescript51": "npm:typescript@5.1",
7676
"typescript52": "npm:typescript@5.2",
7777
"vite": "^5.2.11",
78-
"vitest": "^1.6.0"
78+
"vitest": "^2.0.2"
7979
},
8080
"pnpm": {
8181
"overrides": {

‎packages/angular-query-experimental/src/__tests__/util/lazy-init/lazy-init.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('lazyInit', () => {
5353

5454
test('should init lazily and only once', async () => {
5555
const initCallFn = vi.fn()
56-
const registerDataValue = vi.fn<[number]>()
56+
const registerDataValue = vi.fn<(arg: number) => any>()
5757

5858
let value!: { data: WritableSignal<number> }
5959
const outerSignal = signal(0)

‎packages/angular-query-experimental/src/__tests__/util/lazy-signal-initializer/lazy-signal-initializer.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ describe('lazySignalInitializer', () => {
4646

4747
test('should init lazily and only once', async () => {
4848
const initCallFn = vi.fn()
49-
const registerEffectValue = vi.fn<[number]>()
49+
const registerEffectValue = vi.fn<(arg: number) => any>()
5050

5151
let value!: Signal<number>
5252
const outerSignal = signal(0)

‎packages/query-core/src/__tests__/hydration.test.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ describe('dehydration and rehydration', () => {
7575
key: [{ nestedKey: 1 }],
7676
})
7777

78-
const fetchDataAfterHydration = vi.fn<Array<unknown>, unknown>()
78+
const fetchDataAfterHydration =
79+
vi.fn<(...args: Array<unknown>) => unknown>()
7980
await hydrationClient.prefetchQuery({
8081
queryKey: ['string'],
8182
queryFn: fetchDataAfterHydration,
@@ -280,7 +281,8 @@ describe('dehydration and rehydration', () => {
280281
})?.state.data,
281282
).toBe('string')
282283

283-
const fetchDataAfterHydration = vi.fn<Array<unknown>, unknown>()
284+
const fetchDataAfterHydration =
285+
vi.fn<(...args: Array<unknown>) => unknown>()
284286
await hydrationClient.prefetchQuery({
285287
queryKey: ['string', { key: ['string'], key2: 0 }],
286288
queryFn: fetchDataAfterHydration,

‎packages/query-core/src/__tests__/infiniteQueryObserver.test.tsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ describe('InfiniteQueryObserver', () => {
106106
test('should stop refetching if undefined is returned from getNextPageParam', async () => {
107107
const key = queryKey()
108108
let next: number | undefined = 2
109-
const queryFn = vi.fn<any, any>(({ pageParam }) => String(pageParam))
109+
const queryFn = vi.fn<(...args: Array<any>) => any>(({ pageParam }) =>
110+
String(pageParam),
111+
)
110112
const observer = new InfiniteQueryObserver(queryClient, {
111113
queryKey: key,
112114
queryFn,
@@ -133,7 +135,9 @@ describe('InfiniteQueryObserver', () => {
133135
test('should stop refetching if null is returned from getNextPageParam', async () => {
134136
const key = queryKey()
135137
let next: number | null = 2
136-
const queryFn = vi.fn<any, any>(({ pageParam }) => String(pageParam))
138+
const queryFn = vi.fn<(...args: Array<any>) => any>(({ pageParam }) =>
139+
String(pageParam),
140+
)
137141
const observer = new InfiniteQueryObserver(queryClient, {
138142
queryKey: key,
139143
queryFn,

‎packages/query-core/src/__tests__/query.test.tsx‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,9 @@ describe('query', () => {
196196

197197
const queryFn = vi
198198
.fn<
199-
[QueryFunctionContext<ReturnType<typeof queryKey>>],
200-
Promise<'data'>
199+
(
200+
context: QueryFunctionContext<ReturnType<typeof queryKey>>,
201+
) => Promise<'data'>
201202
>()
202203
.mockResolvedValue('data')
203204

@@ -280,10 +281,12 @@ describe('query', () => {
280281
test('should provide an AbortSignal to the queryFn that provides info about the cancellation state', async () => {
281282
const key = queryKey()
282283

283-
const queryFn = vi.fn<
284-
[QueryFunctionContext<ReturnType<typeof queryKey>>],
285-
Promise<unknown>
286-
>()
284+
const queryFn =
285+
vi.fn<
286+
(
287+
context: QueryFunctionContext<ReturnType<typeof queryKey>>,
288+
) => Promise<unknown>
289+
>()
287290
const onAbort = vi.fn()
288291
const abortListener = vi.fn()
289292
let error
@@ -330,7 +333,7 @@ describe('query', () => {
330333
test('should not continue if explicitly cancelled', async () => {
331334
const key = queryKey()
332335

333-
const queryFn = vi.fn<Array<unknown>, unknown>()
336+
const queryFn = vi.fn<(...args: Array<unknown>) => unknown>()
334337

335338
queryFn.mockImplementation(async () => {
336339
await sleep(10)
@@ -362,7 +365,7 @@ describe('query', () => {
362365
test('should not error if reset while pending', async () => {
363366
const key = queryKey()
364367

365-
const queryFn = vi.fn<Array<unknown>, unknown>()
368+
const queryFn = vi.fn<(...args: Array<unknown>) => unknown>()
366369

367370
queryFn.mockImplementation(async () => {
368371
await sleep(10)
@@ -389,7 +392,7 @@ describe('query', () => {
389392
test('should be able to refetch a cancelled query', async () => {
390393
const key = queryKey()
391394

392-
const queryFn = vi.fn<Array<unknown>, unknown>()
395+
const queryFn = vi.fn<(...args: Array<unknown>) => unknown>()
393396

394397
queryFn.mockImplementation(async () => {
395398
await sleep(50)
@@ -895,8 +898,9 @@ describe('query', () => {
895898

896899
const queryFn = vi
897900
.fn<
898-
[QueryFunctionContext<ReturnType<typeof queryKey>>],
899-
Promise<unknown>
901+
(
902+
context: QueryFunctionContext<ReturnType<typeof queryKey>>,
903+
) => Promise<unknown>
900904
>()
901905
.mockImplementation(({ signal }) => {
902906
return new Promise((resolve, reject) => {

‎packages/query-core/src/__tests__/queryClient.test.tsx‎

Lines changed: 96 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,9 @@ describe('queryClient', () => {
926926
describe('refetchQueries', () => {
927927
test('should not refetch if all observers are disabled', async () => {
928928
const key = queryKey()
929-
const queryFn = vi.fn<Array<unknown>, string>().mockReturnValue('data')
929+
const queryFn = vi
930+
.fn<(...args: Array<unknown>) => string>()
931+
.mockReturnValue('data')
930932
await queryClient.fetchQuery({ queryKey: key, queryFn })
931933
const observer1 = new QueryObserver(queryClient, {
932934
queryKey: key,
@@ -940,7 +942,9 @@ describe('queryClient', () => {
940942
})
941943
test('should refetch if at least one observer is enabled', async () => {
942944
const key = queryKey()
943-
const queryFn = vi.fn<Array<unknown>, string>().mockReturnValue('data')
945+
const queryFn = vi
946+
.fn<(...args: Array<unknown>) => string>()
947+
.mockReturnValue('data')
944948
await queryClient.fetchQuery({ queryKey: key, queryFn })
945949
const observer1 = new QueryObserver(queryClient, {
946950
queryKey: key,
@@ -962,8 +966,12 @@ describe('queryClient', () => {
962966
test('should refetch all queries when no arguments are given', async () => {
963967
const key1 = queryKey()
964968
const key2 = queryKey()
965-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
966-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
969+
const queryFn1 = vi
970+
.fn<(...args: Array<unknown>) => string>()
971+
.mockReturnValue('data1')
972+
const queryFn2 = vi
973+
.fn<(...args: Array<unknown>) => string>()
974+
.mockReturnValue('data2')
967975
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
968976
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
969977
const observer1 = new QueryObserver(queryClient, {
@@ -990,8 +998,12 @@ describe('queryClient', () => {
990998
test('should be able to refetch all fresh queries', async () => {
991999
const key1 = queryKey()
9921000
const key2 = queryKey()
993-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
994-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1001+
const queryFn1 = vi
1002+
.fn<(...args: Array<unknown>) => string>()
1003+
.mockReturnValue('data1')
1004+
const queryFn2 = vi
1005+
.fn<(...args: Array<unknown>) => string>()
1006+
.mockReturnValue('data2')
9951007
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
9961008
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
9971009
const observer = new QueryObserver(queryClient, {
@@ -1009,8 +1021,12 @@ describe('queryClient', () => {
10091021
test('should be able to refetch all stale queries', async () => {
10101022
const key1 = queryKey()
10111023
const key2 = queryKey()
1012-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1013-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1024+
const queryFn1 = vi
1025+
.fn<(...args: Array<unknown>) => string>()
1026+
.mockReturnValue('data1')
1027+
const queryFn2 = vi
1028+
.fn<(...args: Array<unknown>) => string>()
1029+
.mockReturnValue('data2')
10141030
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
10151031
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
10161032
const observer = new QueryObserver(queryClient, {
@@ -1029,8 +1045,12 @@ describe('queryClient', () => {
10291045
test('should be able to refetch all stale and active queries', async () => {
10301046
const key1 = queryKey()
10311047
const key2 = queryKey()
1032-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1033-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1048+
const queryFn1 = vi
1049+
.fn<(...args: Array<unknown>) => string>()
1050+
.mockReturnValue('data1')
1051+
const queryFn2 = vi
1052+
.fn<(...args: Array<unknown>) => string>()
1053+
.mockReturnValue('data2')
10341054
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
10351055
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
10361056
queryClient.invalidateQueries({ queryKey: key1 })
@@ -1051,8 +1071,12 @@ describe('queryClient', () => {
10511071
test('should be able to refetch all active and inactive queries', async () => {
10521072
const key1 = queryKey()
10531073
const key2 = queryKey()
1054-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1055-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1074+
const queryFn1 = vi
1075+
.fn<(...args: Array<unknown>) => string>()
1076+
.mockReturnValue('data1')
1077+
const queryFn2 = vi
1078+
.fn<(...args: Array<unknown>) => string>()
1079+
.mockReturnValue('data2')
10561080
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
10571081
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
10581082
const observer = new QueryObserver(queryClient, {
@@ -1070,8 +1094,12 @@ describe('queryClient', () => {
10701094
test('should be able to refetch all active and inactive queries', async () => {
10711095
const key1 = queryKey()
10721096
const key2 = queryKey()
1073-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1074-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1097+
const queryFn1 = vi
1098+
.fn<(...args: Array<unknown>) => string>()
1099+
.mockReturnValue('data1')
1100+
const queryFn2 = vi
1101+
.fn<(...args: Array<unknown>) => string>()
1102+
.mockReturnValue('data2')
10751103
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
10761104
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
10771105
const observer = new QueryObserver(queryClient, {
@@ -1089,8 +1117,12 @@ describe('queryClient', () => {
10891117
test('should be able to refetch only active queries', async () => {
10901118
const key1 = queryKey()
10911119
const key2 = queryKey()
1092-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1093-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1120+
const queryFn1 = vi
1121+
.fn<(...args: Array<unknown>) => string>()
1122+
.mockReturnValue('data1')
1123+
const queryFn2 = vi
1124+
.fn<(...args: Array<unknown>) => string>()
1125+
.mockReturnValue('data2')
10941126
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
10951127
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
10961128
const observer = new QueryObserver(queryClient, {
@@ -1108,8 +1140,12 @@ describe('queryClient', () => {
11081140
test('should be able to refetch only inactive queries', async () => {
11091141
const key1 = queryKey()
11101142
const key2 = queryKey()
1111-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1112-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1143+
const queryFn1 = vi
1144+
.fn<(...args: Array<unknown>) => string>()
1145+
.mockReturnValue('data1')
1146+
const queryFn2 = vi
1147+
.fn<(...args: Array<unknown>) => string>()
1148+
.mockReturnValue('data2')
11131149
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
11141150
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
11151151
const observer = new QueryObserver(queryClient, {
@@ -1148,7 +1184,9 @@ describe('queryClient', () => {
11481184

11491185
test('should resolve Promise immediately if query is paused', async () => {
11501186
const key1 = queryKey()
1151-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1187+
const queryFn1 = vi
1188+
.fn<(...args: Array<unknown>) => string>()
1189+
.mockReturnValue('data1')
11521190
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
11531191
const onlineMock = mockOnlineManagerIsOnline(false)
11541192

@@ -1162,7 +1200,9 @@ describe('queryClient', () => {
11621200
test('should refetch if query we are offline but query networkMode is always', async () => {
11631201
const key1 = queryKey()
11641202
queryClient.setQueryDefaults(key1, { networkMode: 'always' })
1165-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1203+
const queryFn1 = vi
1204+
.fn<(...args: Array<unknown>) => string>()
1205+
.mockReturnValue('data1')
11661206
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
11671207
const onlineMock = mockOnlineManagerIsOnline(false)
11681208

@@ -1178,8 +1218,12 @@ describe('queryClient', () => {
11781218
test('should refetch active queries by default', async () => {
11791219
const key1 = queryKey()
11801220
const key2 = queryKey()
1181-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1182-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1221+
const queryFn1 = vi
1222+
.fn<(...args: Array<unknown>) => string>()
1223+
.mockReturnValue('data1')
1224+
const queryFn2 = vi
1225+
.fn<(...args: Array<unknown>) => string>()
1226+
.mockReturnValue('data2')
11831227
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
11841228
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
11851229
const observer = new QueryObserver(queryClient, {
@@ -1197,8 +1241,12 @@ describe('queryClient', () => {
11971241
test('should not refetch inactive queries by default', async () => {
11981242
const key1 = queryKey()
11991243
const key2 = queryKey()
1200-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1201-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1244+
const queryFn1 = vi
1245+
.fn<(...args: Array<unknown>) => string>()
1246+
.mockReturnValue('data1')
1247+
const queryFn2 = vi
1248+
.fn<(...args: Array<unknown>) => string>()
1249+
.mockReturnValue('data2')
12021250
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
12031251
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
12041252
const observer = new QueryObserver(queryClient, {
@@ -1216,8 +1264,12 @@ describe('queryClient', () => {
12161264
test('should not refetch active queries when "refetch" is "none"', async () => {
12171265
const key1 = queryKey()
12181266
const key2 = queryKey()
1219-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1220-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1267+
const queryFn1 = vi
1268+
.fn<(...args: Array<unknown>) => string>()
1269+
.mockReturnValue('data1')
1270+
const queryFn2 = vi
1271+
.fn<(...args: Array<unknown>) => string>()
1272+
.mockReturnValue('data2')
12211273
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
12221274
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
12231275
const observer = new QueryObserver(queryClient, {
@@ -1238,8 +1290,12 @@ describe('queryClient', () => {
12381290
test('should refetch inactive queries when "refetch" is "inactive"', async () => {
12391291
const key1 = queryKey()
12401292
const key2 = queryKey()
1241-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1242-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1293+
const queryFn1 = vi
1294+
.fn<(...args: Array<unknown>) => string>()
1295+
.mockReturnValue('data1')
1296+
const queryFn2 = vi
1297+
.fn<(...args: Array<unknown>) => string>()
1298+
.mockReturnValue('data2')
12431299
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
12441300
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
12451301
const observer = new QueryObserver(queryClient, {
@@ -1262,8 +1318,12 @@ describe('queryClient', () => {
12621318
test('should refetch active and inactive queries when "refetch" is "all"', async () => {
12631319
const key1 = queryKey()
12641320
const key2 = queryKey()
1265-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1266-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1321+
const queryFn1 = vi
1322+
.fn<(...args: Array<unknown>) => string>()
1323+
.mockReturnValue('data1')
1324+
const queryFn2 = vi
1325+
.fn<(...args: Array<unknown>) => string>()
1326+
.mockReturnValue('data2')
12671327
await queryClient.fetchQuery({ queryKey: key1, queryFn: queryFn1 })
12681328
await queryClient.fetchQuery({ queryKey: key2, queryFn: queryFn2 })
12691329
const observer = new QueryObserver(queryClient, {
@@ -1385,8 +1445,12 @@ describe('queryClient', () => {
13851445
const key1 = queryKey()
13861446
const key2 = queryKey()
13871447
const key3 = queryKey()
1388-
const queryFn1 = vi.fn<Array<unknown>, string>().mockReturnValue('data1')
1389-
const queryFn2 = vi.fn<Array<unknown>, string>().mockReturnValue('data2')
1448+
const queryFn1 = vi
1449+
.fn<(...args: Array<unknown>) => string>()
1450+
.mockReturnValue('data1')
1451+
const queryFn2 = vi
1452+
.fn<(...args: Array<unknown>) => string>()
1453+
.mockReturnValue('data2')
13901454
const observer1 = new QueryObserver(queryClient, {
13911455
queryKey: key1,
13921456
queryFn: queryFn1,

0 commit comments

Comments
 (0)