diff --git a/packages/preact-query/src/__tests__/useInfiniteQuery.test.tsx b/packages/preact-query/src/__tests__/useInfiniteQuery.test.tsx index 5a96f0dbf0..445883bcf9 100644 --- a/packages/preact-query/src/__tests__/useInfiniteQuery.test.tsx +++ b/packages/preact-query/src/__tests__/useInfiniteQuery.test.tsx @@ -29,21 +29,6 @@ interface Result { const pageSize = 10 -const fetchItems = async ( - page: number, - ts: number, - noNext?: boolean, - noPrev?: boolean, -): Promise => { - await sleep(10) - return { - items: [...new Array(10)].fill(null).map((_, d) => page * pageSize + d), - nextId: noNext ? undefined : page + 1, - prevId: noPrev ? undefined : page - 1, - ts, - } -} - describe('useInfiniteQuery', () => { let queryCache: QueryCache let queryClient: QueryClient @@ -1538,12 +1523,19 @@ describe('useInfiniteQuery', () => { refetch, } = useInfiniteQuery({ queryKey: key, - queryFn: ({ pageParam }) => - fetchItems( - pageParam, - fetchCountRef.current++, - pageParam === MAX || (pageParam === MAX - 1 && isRemovedLastPage), - ), + queryFn: async ({ pageParam }): Promise => { + await sleep(10) + const noNext = + pageParam === MAX || (pageParam === MAX - 1 && isRemovedLastPage) + return { + items: [...new Array(10)] + .fill(null) + .map((_, d) => pageParam * pageSize + d), + nextId: noNext ? undefined : pageParam + 1, + prevId: pageParam - 1, + ts: fetchCountRef.current++, + } + }, getNextPageParam: (lastPage) => lastPage.nextId, initialPageParam: 0, }) diff --git a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx index fdcb9ad38e..517adee332 100644 --- a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx +++ b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx @@ -30,21 +30,6 @@ interface Result { const pageSize = 10 -const fetchItems = async ( - page: number, - ts: number, - noNext?: boolean, - noPrev?: boolean, -): Promise => { - await sleep(10) - return { - items: [...new Array(10)].fill(null).map((_, d) => page * pageSize + d), - nextId: noNext ? undefined : page + 1, - prevId: noPrev ? undefined : page - 1, - ts, - } -} - describe('useInfiniteQuery', () => { let queryCache: QueryCache let queryClient: QueryClient @@ -1617,12 +1602,19 @@ describe('useInfiniteQuery', () => { refetch, } = useInfiniteQuery({ queryKey: key, - queryFn: ({ pageParam }) => - fetchItems( - pageParam, - fetchCountRef.current++, - pageParam === MAX || (pageParam === MAX - 1 && isRemovedLastPage), - ), + queryFn: async ({ pageParam }): Promise => { + await sleep(10) + const noNext = + pageParam === MAX || (pageParam === MAX - 1 && isRemovedLastPage) + return { + items: [...new Array(10)] + .fill(null) + .map((_, d) => pageParam * pageSize + d), + nextId: noNext ? undefined : pageParam + 1, + prevId: pageParam - 1, + ts: fetchCountRef.current++, + } + }, getNextPageParam: (lastPage) => lastPage.nextId, initialPageParam: 0, }) @@ -1803,8 +1795,17 @@ describe('useInfiniteQuery', () => { useTrackRenders() const fetchCountRef = React.useRef(0) const query = useInfiniteQuery({ - queryFn: ({ pageParam }) => - fetchItems(pageParam, fetchCountRef.current++), + queryFn: async ({ pageParam }): Promise => { + await sleep(10) + return { + items: [...new Array(10)] + .fill(null) + .map((_, d) => pageParam * pageSize + d), + nextId: pageParam + 1, + prevId: pageParam - 1, + ts: fetchCountRef.current++, + } + }, getNextPageParam: (lastPage) => lastPage.nextId, initialPageParam: 0, queryKey: key, diff --git a/packages/solid-query/src/__tests__/useInfiniteQuery.test.tsx b/packages/solid-query/src/__tests__/useInfiniteQuery.test.tsx index f54c32ccb6..a863cdb3a7 100644 --- a/packages/solid-query/src/__tests__/useInfiniteQuery.test.tsx +++ b/packages/solid-query/src/__tests__/useInfiniteQuery.test.tsx @@ -36,19 +36,6 @@ interface Result { const pageSize = 10 -const fetchItems = ( - page: number, - ts: number, - noNext?: boolean, - noPrev?: boolean, -): Promise => - sleep(10).then(() => ({ - items: [...new Array(10)].fill(null).map((_, d) => page * pageSize + d), - nextId: noNext ? undefined : page + 1, - prevId: noPrev ? undefined : page - 1, - ts, - })) - describe('useInfiniteQuery', () => { let queryCache: QueryCache let queryClient: QueryClient @@ -1752,12 +1739,18 @@ describe('useInfiniteQuery', () => { const state = useInfiniteQuery(() => ({ queryKey: key, - queryFn: ({ pageParam }) => - fetchItems( - pageParam, - fetchCountRef++, - pageParam === MAX || (pageParam === MAX - 1 && isRemovedLastPage()), - ), + queryFn: ({ pageParam }): Promise => { + const noNext = + pageParam === MAX || (pageParam === MAX - 1 && isRemovedLastPage()) + return sleep(10).then(() => ({ + items: [...new Array(10)] + .fill(null) + .map((_, d) => pageParam * pageSize + d), + nextId: noNext ? undefined : pageParam + 1, + prevId: pageParam - 1, + ts: fetchCountRef++, + })) + }, initialPageParam: 0, getNextPageParam: (lastPage) => lastPage.nextId, }))