diff --git a/packages/react-query/src/__tests__/prefetch.test.tsx b/packages/react-query/src/__tests__/prefetch.test.tsx index 760047782e..1b111b57ad 100644 --- a/packages/react-query/src/__tests__/prefetch.test.tsx +++ b/packages/react-query/src/__tests__/prefetch.test.tsx @@ -16,11 +16,13 @@ import type { InfiniteData, UseInfiniteQueryOptions, UseQueryOptions } from '..' import type { Mock } from 'vitest' const generateQueryFn = (data: string) => - vi.fn>().mockImplementation(async () => { - await sleep(10) + vi + .fn<(...args: Array) => Promise>() + .mockImplementation(async () => { + await sleep(10) - return data - }) + return data + }) const generateInfiniteQueryOptions = ( data: Array<{ data: string; currentPage: number; totalPages: number }>, @@ -29,7 +31,7 @@ const generateInfiniteQueryOptions = ( return { queryFn: vi - .fn>() + .fn<(...args: Array) => Promise<(typeof data)[number]>>() .mockImplementation(async () => { const currentPageData = data[currentPage] if (!currentPageData) { diff --git a/packages/react-query/src/__tests__/ssr-hydration.test.tsx b/packages/react-query/src/__tests__/ssr-hydration.test.tsx index 0e875c5852..907663472a 100644 --- a/packages/react-query/src/__tests__/ssr-hydration.test.tsx +++ b/packages/react-query/src/__tests__/ssr-hydration.test.tsx @@ -46,10 +46,7 @@ describe('Server side rendering with de/rehydration', () => { const consoleMock = vi.spyOn(console, 'error') consoleMock.mockImplementation(() => undefined) - const fetchDataSuccess = vi.fn< - Parameters, - ReturnType - >(fetchData) + const fetchDataSuccess = vi.fn(fetchData) // -- Shared part -- function SuccessComponent() { @@ -203,10 +200,7 @@ describe('Server side rendering with de/rehydration', () => { const consoleMock = vi.spyOn(console, 'error') consoleMock.mockImplementation(() => undefined) - const fetchDataSuccess = vi.fn< - Parameters, - ReturnType - >(fetchData) + const fetchDataSuccess = vi.fn(fetchData) // -- Shared part -- function SuccessComponent() { diff --git a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx index b4024f3c62..716867a57a 100644 --- a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx +++ b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx @@ -920,11 +920,10 @@ describe('useInfiniteQuery', () => { it('should silently cancel an ongoing fetchNextPage request when another fetchNextPage is invoked', async () => { const key = queryKey() const start = 10 - const onAborts: Array> = [] - const abortListeners: Array> = [] + const onAborts: Array) => any>> = [] + const abortListeners: Array) => any>> = [] const fetchPage = vi.fn< - [QueryFunctionContext], - Promise + (context: QueryFunctionContext) => Promise >(async ({ pageParam, signal }) => { const onAbort = vi.fn() const abortListener = vi.fn() @@ -996,11 +995,10 @@ describe('useInfiniteQuery', () => { it('should not cancel an ongoing fetchNextPage request when another fetchNextPage is invoked if `cancelRefetch: false` is used ', async () => { const key = queryKey() const start = 10 - const onAborts: Array> = [] - const abortListeners: Array> = [] + const onAborts: Array) => any>> = [] + const abortListeners: Array) => any>> = [] const fetchPage = vi.fn< - [QueryFunctionContext], - Promise + (context: QueryFunctionContext) => Promise >(async ({ pageParam, signal }) => { const onAbort = vi.fn() const abortListener = vi.fn() diff --git a/packages/react-query/src/__tests__/utils.tsx b/packages/react-query/src/__tests__/utils.tsx index f640fd3d7b..4544c39a3c 100644 --- a/packages/react-query/src/__tests__/utils.tsx +++ b/packages/react-query/src/__tests__/utils.tsx @@ -48,13 +48,13 @@ export function createQueryClient(config?: QueryClientConfig): QueryClient { export function mockVisibilityState( value: DocumentVisibilityState, -): MockInstance<[], DocumentVisibilityState> { +): MockInstance<() => DocumentVisibilityState> { return vi.spyOn(document, 'visibilityState', 'get').mockReturnValue(value) } export function mockOnlineManagerIsOnline( value: boolean, -): MockInstance<[], boolean> { +): MockInstance<() => boolean> { return vi.spyOn(onlineManager, 'isOnline').mockReturnValue(value) }