Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions packages/query-core/src/__tests__/hydration.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 2 additions & 8 deletions packages/query-core/src/__tests__/mutations.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
},
Expand All @@ -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)
},
Expand Down
5 changes: 1 addition & 4 deletions packages/query-core/src/__tests__/queriesObserver.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
])

Expand Down
28 changes: 8 additions & 20 deletions packages/query-core/src/__tests__/query.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 1 addition & 4 deletions packages/query-core/src/__tests__/queryClient.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
38 changes: 12 additions & 26 deletions packages/query-core/src/__tests__/queryObserver.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<QueryObserverResult> = []
const queryFn = async () => {
await sleep(10)
return { count: 1 }
}
const queryFn = () => sleep(10).then(() => ({ count: 1 }))
const observer = new QueryObserver(queryClient, {
queryKey: key,
queryFn,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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<QueryObserverResult<unknown>> = []
Expand All @@ -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()
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading