Skip to content

Commit 48c3975

Browse files
authored
test(query-core): replace 'async/await sleep' with 'sleep().then()' in test 'queryFn' and 'mutationFn' (TanStack#10435)
1 parent 6b95cd8 commit 48c3975

6 files changed

Lines changed: 28 additions & 78 deletions

File tree

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -800,10 +800,7 @@ describe('dehydration and rehydration', () => {
800800

801801
const options = {
802802
queryKey: key,
803-
queryFn: async () => {
804-
await sleep(10)
805-
return 'string'
806-
},
803+
queryFn: () => sleep(10).then(() => 'string'),
807804
} as const
808805

809806
const prefetchPromise = queryClient.prefetchQuery(options)
@@ -1092,10 +1089,7 @@ describe('dehydration and rehydration', () => {
10921089

10931090
const promise = serverQueryClient.prefetchQuery({
10941091
queryKey: key,
1095-
queryFn: async () => {
1096-
await sleep(10)
1097-
return 'server data'
1098-
},
1092+
queryFn: () => sleep(10).then(() => 'server data'),
10991093
})
11001094

11011095
const dehydrated = dehydrate(serverQueryClient)
@@ -1131,10 +1125,7 @@ describe('dehydration and rehydration', () => {
11311125

11321126
const promise = serverQueryClient.prefetchQuery({
11331127
queryKey: key,
1134-
queryFn: async () => {
1135-
await sleep(10)
1136-
return 'server data'
1137-
},
1128+
queryFn: () => sleep(10).then(() => 'server data'),
11381129
})
11391130

11401131
const dehydrated = dehydrate(serverQueryClient)
@@ -1186,10 +1177,7 @@ describe('dehydration and rehydration', () => {
11861177

11871178
const query = {
11881179
queryKey: key,
1189-
queryFn: async () => {
1190-
await sleep(10)
1191-
return countRef.current
1192-
},
1180+
queryFn: () => sleep(10).then(() => countRef.current),
11931181
}
11941182

11951183
const promise = serverQueryClient.prefetchQuery(query)

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -406,10 +406,7 @@ describe('mutations', () => {
406406
const onSuccess = vi.fn()
407407

408408
const mutation = new MutationObserver(queryClient, {
409-
mutationFn: async () => {
410-
await sleep(100)
411-
return Promise.resolve('update')
412-
},
409+
mutationFn: () => sleep(100).then(() => Promise.resolve('update')),
413410
onSuccess: () => {
414411
onSuccess(1)
415412
},
@@ -418,10 +415,7 @@ describe('mutations', () => {
418415
void mutation.mutate()
419416

420417
mutation.setOptions({
421-
mutationFn: async () => {
422-
await sleep(100)
423-
return Promise.resolve('update')
424-
},
418+
mutationFn: () => sleep(100).then(() => Promise.resolve('update')),
425419
onSuccess: () => {
426420
onSuccess(2)
427421
},

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,7 @@ describe('queriesObserver', () => {
296296
const observer = new QueriesObserver(queryClient, [
297297
{
298298
queryKey: key1,
299-
queryFn: async () => {
300-
await sleep(20)
301-
return 1
302-
},
299+
queryFn: () => sleep(20).then(() => 1),
303300
},
304301
])
305302

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

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,7 @@ describe('query', () => {
236236

237237
const observer = new QueryObserver(queryClient, {
238238
queryKey: key,
239-
queryFn: async () => {
240-
await sleep(100)
241-
return 'data'
242-
},
239+
queryFn: () => sleep(100).then(() => 'data'),
243240
})
244241

245242
const unsubscribe = observer.subscribe(() => undefined)
@@ -249,10 +246,7 @@ describe('query', () => {
249246

250247
const promise = queryClient.fetchQuery({
251248
queryKey: key,
252-
queryFn: async ({ signal }) => {
253-
await sleep(100)
254-
return 'data2' + String(signal)
255-
},
249+
queryFn: ({ signal }) => sleep(100).then(() => 'data2' + String(signal)),
256250
})
257251

258252
// Ensure the fetch is in progress
@@ -326,10 +320,8 @@ describe('query', () => {
326320

327321
queryClient.prefetchQuery({
328322
queryKey: key,
329-
queryFn: async ({ signal }) => {
330-
await sleep(100)
331-
return signal.aborted ? 'aborted' : 'data'
332-
},
323+
queryFn: ({ signal }) =>
324+
sleep(100).then(() => (signal.aborted ? 'aborted' : 'data')),
333325
})
334326

335327
await vi.advanceTimersByTimeAsync(10)
@@ -1057,10 +1049,9 @@ describe('query', () => {
10571049
let x = 0
10581050

10591051
queryClient.setQueryData(key, 'initial')
1060-
const queryFn = vi.fn().mockImplementation(async () => {
1061-
await sleep(100)
1062-
return 'data' + x
1063-
})
1052+
const queryFn = vi
1053+
.fn()
1054+
.mockImplementation(() => sleep(100).then(() => 'data' + x))
10641055

10651056
const promise = queryClient.fetchQuery({
10661057
queryKey: key,
@@ -1221,10 +1212,7 @@ describe('query', () => {
12211212

12221213
test('should update initialData when Query exists without data', async () => {
12231214
const key = queryKey()
1224-
const queryFn = vi.fn(async () => {
1225-
await sleep(100)
1226-
return 'data'
1227-
})
1215+
const queryFn = vi.fn(() => sleep(100).then(() => 'data'))
12281216

12291217
const promise = queryClient.prefetchQuery({
12301218
queryKey: key,

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,10 +1038,7 @@ describe('queryClient', () => {
10381038

10391039
const promise = queryClient.fetchQuery({
10401040
queryKey: key,
1041-
queryFn: async () => {
1042-
await sleep(50)
1043-
return 25
1044-
},
1041+
queryFn: () => sleep(50).then(() => 25),
10451042
})
10461043

10471044
await vi.advanceTimersByTimeAsync(10)

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

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -489,10 +489,7 @@ describe('queryObserver', () => {
489489
test('should always run the selector again if selector throws an error and selector is not referentially stable', async () => {
490490
const key = queryKey()
491491
const results: Array<QueryObserverResult> = []
492-
const queryFn = async () => {
493-
await sleep(10)
494-
return { count: 1 }
495-
}
492+
const queryFn = () => sleep(10).then(() => ({ count: 1 }))
496493
const observer = new QueryObserver(queryClient, {
497494
queryKey: key,
498495
queryFn,
@@ -537,10 +534,7 @@ describe('queryObserver', () => {
537534
const observer = new QueryObserver(queryClient, {
538535
queryKey: key,
539536
retry: 0,
540-
queryFn: async () => {
541-
await sleep(10)
542-
return shouldError ? 2 : 1
543-
},
537+
queryFn: () => sleep(10).then(() => (shouldError ? 2 : 1)),
544538
select: (num) => {
545539
if (shouldError) {
546540
throw error
@@ -1163,13 +1157,11 @@ describe('queryObserver', () => {
11631157
const key = queryKey()
11641158
const observer = new QueryObserver(queryClient, {
11651159
queryKey: key,
1166-
queryFn: async () => {
1167-
await sleep(5)
1168-
return {
1160+
queryFn: () =>
1161+
sleep(5).then(() => ({
11691162
data: 'data',
11701163
staleTime: 20,
1171-
}
1172-
},
1164+
})),
11731165
staleTime: (query) => query.state.data?.staleTime ?? 0,
11741166
})
11751167
const results: Array<QueryObserverResult<unknown>> = []
@@ -1191,12 +1183,10 @@ describe('queryObserver', () => {
11911183
const key = queryKey()
11921184
const observer = new QueryObserver(queryClient, {
11931185
queryKey: key,
1194-
queryFn: async () => {
1195-
await sleep(5)
1196-
return {
1186+
queryFn: () =>
1187+
sleep(5).then(() => ({
11971188
data: 'data',
1198-
}
1199-
},
1189+
})),
12001190
staleTime: 'static',
12011191
})
12021192
const result = observer.getCurrentResult()
@@ -1564,10 +1554,7 @@ describe('queryObserver', () => {
15641554
describe('StrictMode behavior', () => {
15651555
it('should deduplicate calls to queryFn', async () => {
15661556
const key = queryKey()
1567-
const queryFn = vi.fn(async () => {
1568-
await sleep(50)
1569-
return 'data'
1570-
})
1557+
const queryFn = vi.fn(() => sleep(50).then(() => 'data'))
15711558
const observer = new QueryObserver(queryClient, {
15721559
queryKey: key,
15731560
queryFn,
@@ -1596,10 +1583,9 @@ describe('queryObserver', () => {
15961583

15971584
it('should resolve with data when signal was consumed', async () => {
15981585
const key = queryKey()
1599-
const queryFn = vi.fn(async ({ signal }) => {
1600-
await sleep(50)
1601-
return 'data' + String(signal)
1602-
})
1586+
const queryFn = vi.fn(({ signal }) =>
1587+
sleep(50).then(() => 'data' + String(signal)),
1588+
)
16031589
const observer = new QueryObserver(queryClient, {
16041590
queryKey: key,
16051591
queryFn,

0 commit comments

Comments
 (0)