From bb611da8d7144d41b55f19cba858bbffcdad3f0a Mon Sep 17 00:00:00 2001 From: Wonsuk Choi Date: Thu, 9 Apr 2026 10:15:40 +0900 Subject: [PATCH] test(query-core): replace 'async/await sleep' with 'sleep().then()' in test 'queryFn' and 'mutationFn' --- .../src/__tests__/hydration.test.tsx | 20 ++-------- .../src/__tests__/mutations.test.tsx | 10 +---- .../src/__tests__/queriesObserver.test.tsx | 5 +-- .../query-core/src/__tests__/query.test.tsx | 28 ++++---------- .../src/__tests__/queryClient.test.tsx | 5 +-- .../src/__tests__/queryObserver.test.tsx | 38 ++++++------------- 6 files changed, 28 insertions(+), 78 deletions(-) diff --git a/packages/query-core/src/__tests__/hydration.test.tsx b/packages/query-core/src/__tests__/hydration.test.tsx index e369ce03fd7..8bb79ec6e9b 100644 --- a/packages/query-core/src/__tests__/hydration.test.tsx +++ b/packages/query-core/src/__tests__/hydration.test.tsx @@ -800,10 +800,7 @@ describe('dehydration and rehydration', () => { const options = { queryKey: key, - queryFn: async () => { - await sleep(10) - return 'string' - }, + queryFn: () => sleep(10).then(() => 'string'), } as const const prefetchPromise = queryClient.prefetchQuery(options) @@ -1092,10 +1089,7 @@ describe('dehydration and rehydration', () => { const promise = serverQueryClient.prefetchQuery({ queryKey: key, - queryFn: async () => { - await sleep(10) - return 'server data' - }, + queryFn: () => sleep(10).then(() => 'server data'), }) const dehydrated = dehydrate(serverQueryClient) @@ -1131,10 +1125,7 @@ describe('dehydration and rehydration', () => { const promise = serverQueryClient.prefetchQuery({ queryKey: key, - queryFn: async () => { - await sleep(10) - return 'server data' - }, + queryFn: () => sleep(10).then(() => 'server data'), }) const dehydrated = dehydrate(serverQueryClient) @@ -1186,10 +1177,7 @@ describe('dehydration and rehydration', () => { const query = { queryKey: key, - queryFn: async () => { - await sleep(10) - return countRef.current - }, + queryFn: () => sleep(10).then(() => countRef.current), } const promise = serverQueryClient.prefetchQuery(query) diff --git a/packages/query-core/src/__tests__/mutations.test.tsx b/packages/query-core/src/__tests__/mutations.test.tsx index cc36cd3b2d3..e04ca39c96d 100644 --- a/packages/query-core/src/__tests__/mutations.test.tsx +++ b/packages/query-core/src/__tests__/mutations.test.tsx @@ -406,10 +406,7 @@ describe('mutations', () => { const onSuccess = vi.fn() const mutation = new MutationObserver(queryClient, { - mutationFn: async () => { - await sleep(100) - return Promise.resolve('update') - }, + mutationFn: () => sleep(100).then(() => Promise.resolve('update')), onSuccess: () => { onSuccess(1) }, @@ -418,10 +415,7 @@ describe('mutations', () => { void mutation.mutate() mutation.setOptions({ - mutationFn: async () => { - await sleep(100) - return Promise.resolve('update') - }, + mutationFn: () => sleep(100).then(() => Promise.resolve('update')), onSuccess: () => { onSuccess(2) }, diff --git a/packages/query-core/src/__tests__/queriesObserver.test.tsx b/packages/query-core/src/__tests__/queriesObserver.test.tsx index 88b763f712c..b2fab48b664 100644 --- a/packages/query-core/src/__tests__/queriesObserver.test.tsx +++ b/packages/query-core/src/__tests__/queriesObserver.test.tsx @@ -296,10 +296,7 @@ describe('queriesObserver', () => { const observer = new QueriesObserver(queryClient, [ { queryKey: key1, - queryFn: async () => { - await sleep(20) - return 1 - }, + queryFn: () => sleep(20).then(() => 1), }, ]) diff --git a/packages/query-core/src/__tests__/query.test.tsx b/packages/query-core/src/__tests__/query.test.tsx index 06908ed2fbc..e84943558ff 100644 --- a/packages/query-core/src/__tests__/query.test.tsx +++ b/packages/query-core/src/__tests__/query.test.tsx @@ -236,10 +236,7 @@ describe('query', () => { const observer = new QueryObserver(queryClient, { queryKey: key, - queryFn: async () => { - await sleep(100) - return 'data' - }, + queryFn: () => sleep(100).then(() => 'data'), }) const unsubscribe = observer.subscribe(() => undefined) @@ -249,10 +246,7 @@ describe('query', () => { const promise = queryClient.fetchQuery({ queryKey: key, - queryFn: async ({ signal }) => { - await sleep(100) - return 'data2' + String(signal) - }, + queryFn: ({ signal }) => sleep(100).then(() => 'data2' + String(signal)), }) // Ensure the fetch is in progress @@ -326,10 +320,8 @@ describe('query', () => { queryClient.prefetchQuery({ queryKey: key, - queryFn: async ({ signal }) => { - await sleep(100) - return signal.aborted ? 'aborted' : 'data' - }, + queryFn: ({ signal }) => + sleep(100).then(() => (signal.aborted ? 'aborted' : 'data')), }) await vi.advanceTimersByTimeAsync(10) @@ -1057,10 +1049,9 @@ describe('query', () => { let x = 0 queryClient.setQueryData(key, 'initial') - const queryFn = vi.fn().mockImplementation(async () => { - await sleep(100) - return 'data' + x - }) + const queryFn = vi + .fn() + .mockImplementation(() => sleep(100).then(() => 'data' + x)) const promise = queryClient.fetchQuery({ queryKey: key, @@ -1221,10 +1212,7 @@ describe('query', () => { test('should update initialData when Query exists without data', async () => { const key = queryKey() - const queryFn = vi.fn(async () => { - await sleep(100) - return 'data' - }) + const queryFn = vi.fn(() => sleep(100).then(() => 'data')) const promise = queryClient.prefetchQuery({ queryKey: key, diff --git a/packages/query-core/src/__tests__/queryClient.test.tsx b/packages/query-core/src/__tests__/queryClient.test.tsx index 2676717fb62..4871d823c1f 100644 --- a/packages/query-core/src/__tests__/queryClient.test.tsx +++ b/packages/query-core/src/__tests__/queryClient.test.tsx @@ -1038,10 +1038,7 @@ describe('queryClient', () => { const promise = queryClient.fetchQuery({ queryKey: key, - queryFn: async () => { - await sleep(50) - return 25 - }, + queryFn: () => sleep(50).then(() => 25), }) await vi.advanceTimersByTimeAsync(10) diff --git a/packages/query-core/src/__tests__/queryObserver.test.tsx b/packages/query-core/src/__tests__/queryObserver.test.tsx index b27d5d53ef3..58306f072c0 100644 --- a/packages/query-core/src/__tests__/queryObserver.test.tsx +++ b/packages/query-core/src/__tests__/queryObserver.test.tsx @@ -489,10 +489,7 @@ describe('queryObserver', () => { test('should always run the selector again if selector throws an error and selector is not referentially stable', async () => { const key = queryKey() const results: Array = [] - const queryFn = async () => { - await sleep(10) - return { count: 1 } - } + const queryFn = () => sleep(10).then(() => ({ count: 1 })) const observer = new QueryObserver(queryClient, { queryKey: key, queryFn, @@ -537,10 +534,7 @@ describe('queryObserver', () => { const observer = new QueryObserver(queryClient, { queryKey: key, retry: 0, - queryFn: async () => { - await sleep(10) - return shouldError ? 2 : 1 - }, + queryFn: () => sleep(10).then(() => (shouldError ? 2 : 1)), select: (num) => { if (shouldError) { throw error @@ -1163,13 +1157,11 @@ describe('queryObserver', () => { const key = queryKey() const observer = new QueryObserver(queryClient, { queryKey: key, - queryFn: async () => { - await sleep(5) - return { + queryFn: () => + sleep(5).then(() => ({ data: 'data', staleTime: 20, - } - }, + })), staleTime: (query) => query.state.data?.staleTime ?? 0, }) const results: Array> = [] @@ -1191,12 +1183,10 @@ describe('queryObserver', () => { const key = queryKey() const observer = new QueryObserver(queryClient, { queryKey: key, - queryFn: async () => { - await sleep(5) - return { + queryFn: () => + sleep(5).then(() => ({ data: 'data', - } - }, + })), staleTime: 'static', }) const result = observer.getCurrentResult() @@ -1564,10 +1554,7 @@ describe('queryObserver', () => { describe('StrictMode behavior', () => { it('should deduplicate calls to queryFn', async () => { const key = queryKey() - const queryFn = vi.fn(async () => { - await sleep(50) - return 'data' - }) + const queryFn = vi.fn(() => sleep(50).then(() => 'data')) const observer = new QueryObserver(queryClient, { queryKey: key, queryFn, @@ -1596,10 +1583,9 @@ describe('queryObserver', () => { it('should resolve with data when signal was consumed', async () => { const key = queryKey() - const queryFn = vi.fn(async ({ signal }) => { - await sleep(50) - return 'data' + String(signal) - }) + const queryFn = vi.fn(({ signal }) => + sleep(50).then(() => 'data' + String(signal)), + ) const observer = new QueryObserver(queryClient, { queryKey: key, queryFn,