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
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,11 +79,7 @@ describe('fine grained persister', () => {
it('should restore query state from persister and refetch', async () => {
const key = queryKey()
const hash = hashKey(key)
const spy = vi.fn(async () => {
await sleep(5)

return 'Works from queryFn'
})
const spy = vi.fn(() => sleep(5).then(() => 'Works from queryFn'))

const mapStorage = new Map()
const storage = {
Expand Down
17 changes: 5 additions & 12 deletions packages/react-query/src/__tests__/useMutation.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,10 +157,9 @@ describe('useMutation', () => {
return Promise.reject(new Error('Error test Jonas'))
})

mutateFn.mockImplementation(async (value) => {
await sleep(10)
return Promise.resolve(value)
})
mutateFn.mockImplementation((value) =>
sleep(10).then(() => Promise.resolve(value)),
)

function Page() {
const { mutate, failureCount, failureReason, data, status } = useMutation(
Expand DownExpand Up@@ -369,10 +368,7 @@ describe('useMutation', () => {
const key = queryKey()

queryClient.setMutationDefaults(key, {
mutationFn: async (text: string) => {
await sleep(10)
return text
},
mutationFn: (text: string) => sleep(10).then(() => text),
})

const states: Array<UseMutationResult<any, any, any, any>> = []
Expand DownExpand Up@@ -1033,10 +1029,7 @@ describe('useMutation', () => {

function Page() {
const mutation = useMutation({
mutationFn: async (_text: string) => {
await sleep(10)
return 'result'
},
mutationFn: (_text: string) => sleep(10).then(() => 'result'),
onSuccess: () => Promise.reject(error),
onError,
})
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,11 +17,7 @@ import type { UseSuspenseQueryOptions } from '..'
const generateQueryFn = (data: string) =>
vi
.fn<(...args: Array<any>) => Promise<string>>()
.mockImplementation(async () => {
await sleep(10)

return data
})
.mockImplementation(() => sleep(10).then(() => data))

describe('usePrefetchQuery', () => {
let queryCache: QueryCache
Expand Down
92 changes: 20 additions & 72 deletions packages/react-query/src/__tests__/useQueries.test.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,17 +54,11 @@ describe('useQueries', () => {
queries: [
{
queryKey: key1,
queryFn: async () => {
await sleep(10)
return 1
},
queryFn: () => sleep(10).then(() => 1),
},
{
queryKey: key2,
queryFn: async () => {
await sleep(200)
return 2
},
queryFn: () => sleep(200).then(() => 2),
},
],
})
Expand DownExpand Up@@ -1093,17 +1087,11 @@ describe('useQueries', () => {
queries: [
{
queryKey: key1,
queryFn: async () => {
await sleep(5)
return Promise.resolve('query1')
},
queryFn: () => sleep(5).then(() => Promise.resolve('query1')),
},
{
queryKey: key2,
queryFn: async () => {
await sleep(20)
return Promise.resolve('query2')
},
queryFn: () => sleep(20).then(() => Promise.resolve('query2')),
},
],
combine: ([query1, query2]) => {
Expand DownExpand Up@@ -1138,17 +1126,13 @@ describe('useQueries', () => {
queries: [
{
queryKey: key1,
queryFn: async () => {
await sleep(5)
return Promise.resolve('first result ' + count)
},
queryFn: () =>
sleep(5).then(() => Promise.resolve('first result ' + count)),
},
{
queryKey: key2,
queryFn: async () => {
await sleep(50)
return Promise.resolve('second result ' + count)
},
queryFn: () =>
sleep(50).then(() => Promise.resolve('second result ' + count)),
},
],
combine: (queryResults) => {
Expand DownExpand Up@@ -1330,17 +1314,11 @@ describe('useQueries', () => {
queries: [
{
queryKey: key1,
queryFn: async () => {
await sleep(10)
return 'first result:' + value
},
queryFn: () => sleep(10).then(() => 'first result:' + value),
},
{
queryKey: key2,
queryFn: async () => {
await sleep(20)
return 'second result:' + value
},
queryFn: () => sleep(20).then(() => 'second result:' + value),
},
],
combine: React.useCallback((results: Array<QueryObserverResult>) => {
Expand DownExpand Up@@ -1414,17 +1392,11 @@ describe('useQueries', () => {
queries: [
{
queryKey: [key1],
queryFn: async () => {
await sleep(10)
return 'first result'
},
queryFn: () => sleep(10).then(() => 'first result'),
},
{
queryKey: [key2],
queryFn: async () => {
await sleep(20)
return 'second result'
},
queryFn: () => sleep(20).then(() => 'second result'),
},
],
combine: React.useCallback(
Expand DownExpand Up@@ -1538,24 +1510,15 @@ describe('useQueries', () => {
queries: [
{
queryKey: [key1],
queryFn: async () => {
await sleep(10)
return 'first result'
},
queryFn: () => sleep(10).then(() => 'first result'),
},
{
queryKey: [key2],
queryFn: async () => {
await sleep(15)
return 'second result'
},
queryFn: () => sleep(15).then(() => 'second result'),
},
{
queryKey: [key3],
queryFn: async () => {
await sleep(20)
return 'third result'
},
queryFn: () => sleep(20).then(() => 'third result'),
},
],
combine: (results) => {
Expand DownExpand Up@@ -1600,24 +1563,15 @@ describe('useQueries', () => {
queries: [
{
queryKey: [key1],
queryFn: async () => {
await sleep(10)
return 'first result'
},
queryFn: () => sleep(10).then(() => 'first result'),
},
{
queryKey: [key2],
queryFn: async () => {
await sleep(15)
return 'second result'
},
queryFn: () => sleep(15).then(() => 'second result'),
},
{
queryKey: [key3],
queryFn: async () => {
await sleep(20)
return 'third result'
},
queryFn: () => sleep(20).then(() => 'third result'),
},
],
combine: (results) => {
Expand DownExpand Up@@ -1679,17 +1633,11 @@ describe('useQueries', () => {
queries: [
{
queryKey: key1,
queryFn: async () => {
await sleep(10)
return 'first result'
},
queryFn: () => sleep(10).then(() => 'first result'),
},
{
queryKey: key2,
queryFn: async () => {
await sleep(20)
return 'second result'
},
queryFn: () => sleep(20).then(() => 'second result'),
},
],
combine: React.useCallback((results: Array<QueryObserverResult>) => {
Expand Down
Loading
Loading