Skip to content

Commit

Permalink
chore: update
Browse files Browse the repository at this point in the history
  • Loading branch information
manudeli committed Jul 14, 2024
1 parent b3b2a20 commit c498eca
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 23 deletions.
12 changes: 7 additions & 5 deletions packages/react-query/src/__tests__/prefetch.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ import type { InfiniteData, UseInfiniteQueryOptions, UseQueryOptions } from '..'
import type { Mock } from 'vitest'

const generateQueryFn = (data: string) =>
vi.fn<any, Promise<string>>().mockImplementation(async () => {
await sleep(10)
vi
.fn<(...args: Array<any>) => Promise<string>>()
.mockImplementation(async () => {
await sleep(10)

return data
})
return data
})

const generateInfiniteQueryOptions = (
data: Array<{ data: string; currentPage: number; totalPages: number }>,
Expand All @@ -29,7 +31,7 @@ const generateInfiniteQueryOptions = (

return {
queryFn: vi
.fn<any, Promise<(typeof data)[number]>>()
.fn<(...args: Array<any>) => Promise<(typeof data)[number]>>()
.mockImplementation(async () => {
const currentPageData = data[currentPage]
if (!currentPageData) {
Expand Down
10 changes: 2 additions & 8 deletions packages/react-query/src/__tests__/ssr-hydration.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<typeof fetchData>,
ReturnType<typeof fetchData>
>(fetchData)
const fetchDataSuccess = vi.fn<typeof fetchData>(fetchData)

// -- Shared part --
function SuccessComponent() {
Expand Down Expand Up @@ -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<typeof fetchData>,
ReturnType<typeof fetchData>
>(fetchData)
const fetchDataSuccess = vi.fn<typeof fetchData>(fetchData)

// -- Shared part --
function SuccessComponent() {
Expand Down
14 changes: 6 additions & 8 deletions packages/react-query/src/__tests__/useInfiniteQuery.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<Mock<any, any>> = []
const abortListeners: Array<Mock<any, any>> = []
const onAborts: Array<Mock<(...args: Array<any>) => any>> = []
const abortListeners: Array<Mock<(...args: Array<any>) => any>> = []
const fetchPage = vi.fn<
[QueryFunctionContext<typeof key, number>],
Promise<number>
(context: QueryFunctionContext<typeof key, number>) => Promise<number>
>(async ({ pageParam, signal }) => {
const onAbort = vi.fn()
const abortListener = vi.fn()
Expand Down Expand Up @@ -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<Mock<any, any>> = []
const abortListeners: Array<Mock<any, any>> = []
const onAborts: Array<Mock<(...args: Array<any>) => any>> = []
const abortListeners: Array<Mock<(...args: Array<any>) => any>> = []
const fetchPage = vi.fn<
[QueryFunctionContext<typeof key, number>],
Promise<number>
(context: QueryFunctionContext<typeof key, number>) => Promise<number>
>(async ({ pageParam, signal }) => {
const onAbort = vi.fn()
const abortListener = vi.fn()
Expand Down
4 changes: 2 additions & 2 deletions packages/react-query/src/__tests__/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down

0 comments on commit c498eca

Please sign in to comment.