diff --git a/packages/preact-query/src/__tests__/QueryResetErrorBoundary.test.tsx b/packages/preact-query/src/__tests__/QueryResetErrorBoundary.test.tsx index 1f1bb00b8d5..5d873cf1800 100644 --- a/packages/preact-query/src/__tests__/QueryResetErrorBoundary.test.tsx +++ b/packages/preact-query/src/__tests__/QueryResetErrorBoundary.test.tsx @@ -17,17 +17,20 @@ import { ErrorBoundary } from './ErrorBoundary' import { renderWithClient } from './utils' describe('QueryErrorResetBoundary', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - describe('useQuery', () => { it('should retry fetch if the reset error boundary has been reset', async () => { const consoleMock = vi diff --git a/packages/preact-query/src/__tests__/fine-grained-persister.test.tsx b/packages/preact-query/src/__tests__/fine-grained-persister.test.tsx index 87bd366253a..a4f7172b5c0 100644 --- a/packages/preact-query/src/__tests__/fine-grained-persister.test.tsx +++ b/packages/preact-query/src/__tests__/fine-grained-persister.test.tsx @@ -10,17 +10,20 @@ import { QueryCache, QueryClient, hashKey, useQuery } from '..' import { renderWithClient } from './utils' describe('fine grained persister', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - it('should restore query state from persister and not refetch', async () => { const key = queryKey() const hash = hashKey(key) diff --git a/packages/preact-query/src/__tests__/ssr.test.tsx b/packages/preact-query/src/__tests__/ssr.test.tsx index d543a57501f..deae3ba27e9 100644 --- a/packages/preact-query/src/__tests__/ssr.test.tsx +++ b/packages/preact-query/src/__tests__/ssr.test.tsx @@ -27,6 +27,7 @@ describe('Server Side Rendering', () => { afterEach(() => { vi.useRealTimers() + queryClient.clear() }) it('should not trigger fetch', () => { @@ -53,8 +54,6 @@ describe('Server Side Rendering', () => { expect(markup).toContain('status pending') expect(queryFn).toHaveBeenCalledTimes(0) - - queryCache.clear() }) it('should add prefetched data to cache', async () => { @@ -70,8 +69,6 @@ describe('Server Side Rendering', () => { expect(data).toBe('data') expect(queryCache.find({ queryKey: key })?.state.data).toBe('data') - - queryCache.clear() }) it('should return existing data from the cache', async () => { @@ -101,8 +98,6 @@ describe('Server Side Rendering', () => { expect(markup).toContain('status success') expect(queryFn).toHaveBeenCalledTimes(1) - - queryCache.clear() }) it('should add initialData to the cache', () => { @@ -133,8 +128,6 @@ describe('Server Side Rendering', () => { const keys = queryCache.getAll().map((query) => query.queryKey) expect(keys).toEqual([[key, 1]]) - - queryCache.clear() }) it('useMutationState should return empty array', () => { @@ -151,8 +144,6 @@ describe('Server Side Rendering', () => { ) expect(markup).toContain('mutationState: 0') - - queryCache.clear() }) it('useInfiniteQuery should return the correct state', async () => { @@ -190,7 +181,5 @@ describe('Server Side Rendering', () => { expect(markup).toContain('page 1') expect(queryFn).toHaveBeenCalledTimes(1) - - queryCache.clear() }) }) diff --git a/packages/preact-query/src/__tests__/suspense.test.tsx b/packages/preact-query/src/__tests__/suspense.test.tsx index e731f8121ab..05f50d0abeb 100644 --- a/packages/preact-query/src/__tests__/suspense.test.tsx +++ b/packages/preact-query/src/__tests__/suspense.test.tsx @@ -53,6 +53,7 @@ describe('Suspense Timer Tests', () => { afterEach(() => { vi.useRealTimers() + queryClient.clear() }) it('should enforce minimum staleTime of 1000ms when using suspense with number', async () => { diff --git a/packages/preact-query/src/__tests__/useInfiniteQuery.test.tsx b/packages/preact-query/src/__tests__/useInfiniteQuery.test.tsx index cfbf15e6952..e37238ca7bf 100644 --- a/packages/preact-query/src/__tests__/useInfiniteQuery.test.tsx +++ b/packages/preact-query/src/__tests__/useInfiniteQuery.test.tsx @@ -45,22 +45,25 @@ const fetchItems = async ( } describe('useInfiniteQuery', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ + queryCache, + defaultOptions: { + queries: { + experimental_prefetchInRender: true, + }, + }, + }) }) afterEach(() => { vi.useRealTimers() - }) - - const queryCache = new QueryCache() - const queryClient = new QueryClient({ - queryCache, - defaultOptions: { - queries: { - experimental_prefetchInRender: true, - }, - }, + queryClient.clear() }) it('should return the correct states for a successful query', async () => { diff --git a/packages/preact-query/src/__tests__/useMutation.test.tsx b/packages/preact-query/src/__tests__/useMutation.test.tsx index f6d75e8eaa7..20da59ce502 100644 --- a/packages/preact-query/src/__tests__/useMutation.test.tsx +++ b/packages/preact-query/src/__tests__/useMutation.test.tsx @@ -29,6 +29,7 @@ describe('useMutation', () => { afterEach(() => { vi.useRealTimers() + queryClient.clear() }) it('should be able to reset `data`', async () => { diff --git a/packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx b/packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx index f87cb2a2204..40c88ce47c1 100644 --- a/packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx +++ b/packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx @@ -42,19 +42,21 @@ const generateInfiniteQueryOptions = ( } describe('usePrefetchInfiniteQuery', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { + vi.useRealTimers() queryClient.clear() Fallback.mockClear() - vi.useRealTimers() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - const Fallback = vi.fn().mockImplementation(() =>
Loading...
) function Suspended(props: { diff --git a/packages/preact-query/src/__tests__/usePrefetchQuery.test.tsx b/packages/preact-query/src/__tests__/usePrefetchQuery.test.tsx index c8fa85339e0..603d3f4b3ee 100644 --- a/packages/preact-query/src/__tests__/usePrefetchQuery.test.tsx +++ b/packages/preact-query/src/__tests__/usePrefetchQuery.test.tsx @@ -25,15 +25,18 @@ const generateQueryFn = (data: string) => }) describe('usePrefetchQuery', () => { - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) + let queryCache: QueryCache + let queryClient: QueryClient beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) function Suspended(props: { diff --git a/packages/preact-query/src/__tests__/useQueries.test.tsx b/packages/preact-query/src/__tests__/useQueries.test.tsx index 7b6b59c6996..83bc5785d85 100644 --- a/packages/preact-query/src/__tests__/useQueries.test.tsx +++ b/packages/preact-query/src/__tests__/useQueries.test.tsx @@ -31,17 +31,20 @@ import { ErrorBoundary } from './ErrorBoundary' import { renderWithClient } from './utils' describe('useQueries', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - it('should return the correct states', async () => { const key1 = queryKey() const key2 = queryKey() diff --git a/packages/preact-query/src/__tests__/useQuery.test.tsx b/packages/preact-query/src/__tests__/useQuery.test.tsx index ae7676a941c..b03b9edea25 100644 --- a/packages/preact-query/src/__tests__/useQuery.test.tsx +++ b/packages/preact-query/src/__tests__/useQuery.test.tsx @@ -48,6 +48,7 @@ describe('useQuery', () => { afterEach(() => { vi.useRealTimers() + queryClient.clear() }) // See https://github.com/tannerlinsley/react-query/issues/105 diff --git a/packages/preact-query/src/__tests__/useSuspenseInfiniteQuery.test.tsx b/packages/preact-query/src/__tests__/useSuspenseInfiniteQuery.test.tsx index 3c2ef26f7ec..c985edbfe98 100644 --- a/packages/preact-query/src/__tests__/useSuspenseInfiniteQuery.test.tsx +++ b/packages/preact-query/src/__tests__/useSuspenseInfiniteQuery.test.tsx @@ -1,6 +1,6 @@ import { queryKey } from '@tanstack/query-test-utils' import { Suspense } from 'preact/compat' -import { describe, expect, it, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { QueryCache, @@ -11,8 +11,17 @@ import { import { renderWithClient } from './utils' describe('useSuspenseInfiniteQuery', () => { - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) + let queryCache: QueryCache + let queryClient: QueryClient + + beforeEach(() => { + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) + }) + + afterEach(() => { + queryClient.clear() + }) it('should log an error when skipToken is passed as queryFn', () => { const consoleErrorSpy = vi diff --git a/packages/preact-query/src/__tests__/useSuspenseQuery.test.tsx b/packages/preact-query/src/__tests__/useSuspenseQuery.test.tsx index fd38f84915e..a523fb45319 100644 --- a/packages/preact-query/src/__tests__/useSuspenseQuery.test.tsx +++ b/packages/preact-query/src/__tests__/useSuspenseQuery.test.tsx @@ -22,17 +22,20 @@ import { ErrorBoundary } from './ErrorBoundary' import { renderWithClient } from './utils' describe('useSuspenseQuery', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - /** * Preact Suspense handles the rerenders differently than React. * This test only checks for 4 renders (vs. React -> 6) diff --git a/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx b/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx index f1506fb0e29..016e7f34d01 100644 --- a/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx +++ b/packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx @@ -15,17 +15,20 @@ import { import { renderWithClient } from './utils' describe('QueryErrorResetBoundary', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - describe('useQuery', () => { it('should retry fetch if the reset error boundary has been reset', async () => { const consoleMock = vi diff --git a/packages/react-query/src/__tests__/fine-grained-persister.test.tsx b/packages/react-query/src/__tests__/fine-grained-persister.test.tsx index e2b76a4c42a..e6b455876bc 100644 --- a/packages/react-query/src/__tests__/fine-grained-persister.test.tsx +++ b/packages/react-query/src/__tests__/fine-grained-persister.test.tsx @@ -9,17 +9,20 @@ import { QueryCache, QueryClient, hashKey, useQuery } from '..' import { renderWithClient } from './utils' describe('fine grained persister', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - it('should restore query state from persister and not refetch', async () => { const key = queryKey() const hash = hashKey(key) diff --git a/packages/react-query/src/__tests__/ssr.test.tsx b/packages/react-query/src/__tests__/ssr.test.tsx index 8ca076c5478..3cd16c7ee92 100644 --- a/packages/react-query/src/__tests__/ssr.test.tsx +++ b/packages/react-query/src/__tests__/ssr.test.tsx @@ -29,6 +29,7 @@ describe('Server Side Rendering', () => { afterEach(() => { vi.useRealTimers() + queryClient.clear() }) it('should not trigger fetch', () => { @@ -55,8 +56,6 @@ describe('Server Side Rendering', () => { expect(markup).toContain('status pending') expect(queryFn).toHaveBeenCalledTimes(0) - - queryCache.clear() }) it('should add prefetched data to cache', async () => { @@ -72,8 +71,6 @@ describe('Server Side Rendering', () => { expect(data).toBe('data') expect(queryCache.find({ queryKey: key })?.state.data).toBe('data') - - queryCache.clear() }) it('should return existing data from the cache', async () => { @@ -103,8 +100,6 @@ describe('Server Side Rendering', () => { expect(markup).toContain('status success') expect(queryFn).toHaveBeenCalledTimes(1) - - queryCache.clear() }) it('should add initialData to the cache', () => { @@ -135,8 +130,6 @@ describe('Server Side Rendering', () => { const keys = queryCache.getAll().map((query) => query.queryKey) expect(keys).toEqual([[key, 1]]) - - queryCache.clear() }) it('useInfiniteQuery should return the correct state', async () => { @@ -174,8 +167,6 @@ describe('Server Side Rendering', () => { expect(markup).toContain('page 1') expect(queryFn).toHaveBeenCalledTimes(1) - - queryCache.clear() }) it('useIsFetching should return 0 after prefetch completes', async () => { @@ -205,8 +196,6 @@ describe('Server Side Rendering', () => { expect(markup).toContain('data') expect(markup).toContain('isFetching: 0') - - queryCache.clear() }) it('useQueries should return existing data from the cache', async () => { @@ -247,8 +236,6 @@ describe('Server Side Rendering', () => { expect(markup).toContain('status2: success') expect(markup).toContain('data1: data1') expect(markup).toContain('data2: data2') - - queryCache.clear() }) it('useMutation should return idle status', () => { @@ -267,8 +254,6 @@ describe('Server Side Rendering', () => { ) expect(markup).toContain('status: idle') - - queryCache.clear() }) it('useMutationState should return empty array', () => { @@ -285,7 +270,5 @@ describe('Server Side Rendering', () => { ) expect(markup).toContain('mutationState: 0') - - queryCache.clear() }) }) diff --git a/packages/react-query/src/__tests__/suspense.test.tsx b/packages/react-query/src/__tests__/suspense.test.tsx index 41acbb40981..99e9ff7fe9d 100644 --- a/packages/react-query/src/__tests__/suspense.test.tsx +++ b/packages/react-query/src/__tests__/suspense.test.tsx @@ -51,6 +51,7 @@ describe('Suspense Timer Tests', () => { afterEach(() => { vi.useRealTimers() + queryClient.clear() }) it('should enforce minimum staleTime of 1000ms when using suspense with number', async () => { diff --git a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx index d663eb3177c..d8de686d1a0 100644 --- a/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx +++ b/packages/react-query/src/__tests__/useInfiniteQuery.test.tsx @@ -46,22 +46,25 @@ const fetchItems = async ( } describe('useInfiniteQuery', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ + queryCache, + defaultOptions: { + queries: { + experimental_prefetchInRender: true, + }, + }, + }) }) afterEach(() => { vi.useRealTimers() - }) - - const queryCache = new QueryCache() - const queryClient = new QueryClient({ - queryCache, - defaultOptions: { - queries: { - experimental_prefetchInRender: true, - }, - }, + queryClient.clear() }) it('should return the correct states for a successful query', async () => { diff --git a/packages/react-query/src/__tests__/useMutation.test.tsx b/packages/react-query/src/__tests__/useMutation.test.tsx index 7b30546d583..02143c2811e 100644 --- a/packages/react-query/src/__tests__/useMutation.test.tsx +++ b/packages/react-query/src/__tests__/useMutation.test.tsx @@ -28,6 +28,7 @@ describe('useMutation', () => { afterEach(() => { vi.useRealTimers() + queryClient.clear() }) it('should be able to reset `data`', async () => { diff --git a/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx b/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx index 7b0a21f271b..6bfe00e0882 100644 --- a/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx +++ b/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx @@ -43,17 +43,20 @@ const generateInfiniteQueryOptions = ( } describe('usePrefetchInfiniteQuery', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - function Suspended(props: { queryOpts: UseSuspenseInfiniteQueryOptions< T, diff --git a/packages/react-query/src/__tests__/usePrefetchQuery.test.tsx b/packages/react-query/src/__tests__/usePrefetchQuery.test.tsx index e196a2f6201..25f14949751 100644 --- a/packages/react-query/src/__tests__/usePrefetchQuery.test.tsx +++ b/packages/react-query/src/__tests__/usePrefetchQuery.test.tsx @@ -24,15 +24,18 @@ const generateQueryFn = (data: string) => }) describe('usePrefetchQuery', () => { - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) + let queryCache: QueryCache + let queryClient: QueryClient beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) function Suspended(props: { diff --git a/packages/react-query/src/__tests__/useQueries.test.tsx b/packages/react-query/src/__tests__/useQueries.test.tsx index 068b22494c6..25b624964dc 100644 --- a/packages/react-query/src/__tests__/useQueries.test.tsx +++ b/packages/react-query/src/__tests__/useQueries.test.tsx @@ -30,17 +30,20 @@ import type { import type { QueryFunctionContext } from '@tanstack/query-core' describe('useQueries', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - it('should return the correct states', async () => { const key1 = queryKey() const key2 = queryKey() diff --git a/packages/react-query/src/__tests__/useQuery.test.tsx b/packages/react-query/src/__tests__/useQuery.test.tsx index 8b7829915d7..0542dfe7eac 100644 --- a/packages/react-query/src/__tests__/useQuery.test.tsx +++ b/packages/react-query/src/__tests__/useQuery.test.tsx @@ -40,6 +40,7 @@ describe('useQuery', () => { afterEach(() => { vi.useRealTimers() + queryClient.clear() }) // See https://github.com/tannerlinsley/react-query/issues/105 diff --git a/packages/react-query/src/__tests__/useSuspenseInfiniteQuery.test.tsx b/packages/react-query/src/__tests__/useSuspenseInfiniteQuery.test.tsx index df3ae92bf32..962f8b0fa50 100644 --- a/packages/react-query/src/__tests__/useSuspenseInfiniteQuery.test.tsx +++ b/packages/react-query/src/__tests__/useSuspenseInfiniteQuery.test.tsx @@ -12,17 +12,20 @@ import { renderWithClient } from './utils' import type { InfiniteData, UseSuspenseInfiniteQueryResult } from '..' describe('useSuspenseInfiniteQuery', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - it('should return the correct states for a successful infinite query', async () => { const key = queryKey() const states: Array>> = diff --git a/packages/react-query/src/__tests__/useSuspenseQuery.test.tsx b/packages/react-query/src/__tests__/useSuspenseQuery.test.tsx index de8d535b7ac..9a01fc784b5 100644 --- a/packages/react-query/src/__tests__/useSuspenseQuery.test.tsx +++ b/packages/react-query/src/__tests__/useSuspenseQuery.test.tsx @@ -20,17 +20,20 @@ import type { } from '..' describe('useSuspenseQuery', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - it('should render the correct amount of times in Suspense mode', async () => { const key = queryKey() const states: Array> = [] diff --git a/packages/solid-query/src/__tests__/suspense.test.tsx b/packages/solid-query/src/__tests__/suspense.test.tsx index 8fbb86e9f3b..b2df435dfc2 100644 --- a/packages/solid-query/src/__tests__/suspense.test.tsx +++ b/packages/solid-query/src/__tests__/suspense.test.tsx @@ -19,17 +19,20 @@ import { import type { InfiniteData, UseInfiniteQueryResult, UseQueryResult } from '..' describe("useQuery's in Suspense mode", () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - it('should render the correct amount of times in Suspense mode', async () => { const key = queryKey() const states: Array> = [] diff --git a/packages/solid-query/src/__tests__/transition.test.tsx b/packages/solid-query/src/__tests__/transition.test.tsx index 81a8c2d9b8f..89c1c182276 100644 --- a/packages/solid-query/src/__tests__/transition.test.tsx +++ b/packages/solid-query/src/__tests__/transition.test.tsx @@ -5,17 +5,20 @@ import { queryKey, sleep } from '@tanstack/query-test-utils' import { QueryCache, QueryClient, QueryClientProvider, useQuery } from '..' describe("useQuery's in Suspense mode with transitions", () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - it('should render the content when the transition is done', async () => { const key = queryKey() diff --git a/packages/solid-query/src/__tests__/useInfiniteQuery.test.tsx b/packages/solid-query/src/__tests__/useInfiniteQuery.test.tsx index 7e7c1590ce7..0c68ee77ff0 100644 --- a/packages/solid-query/src/__tests__/useInfiniteQuery.test.tsx +++ b/packages/solid-query/src/__tests__/useInfiniteQuery.test.tsx @@ -51,17 +51,20 @@ const fetchItems = ( })) describe('useInfiniteQuery', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - it('should return the correct states for a successful query', async () => { const key = queryKey() const states: Array>> = [] diff --git a/packages/solid-query/src/__tests__/useMutation.test.tsx b/packages/solid-query/src/__tests__/useMutation.test.tsx index 66a1f76a8e3..44bc4879680 100644 --- a/packages/solid-query/src/__tests__/useMutation.test.tsx +++ b/packages/solid-query/src/__tests__/useMutation.test.tsx @@ -18,18 +18,22 @@ import { mockOnlineManagerIsOnline, setActTimeout } from './utils' import type { UseMutationResult } from '../types' describe('useMutation', () => { + let queryCache: QueryCache + let mutationCache: MutationCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + mutationCache = new MutationCache() + queryClient = new QueryClient({ queryCache, mutationCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const mutationCache = new MutationCache() - const queryClient = new QueryClient({ queryCache, mutationCache }) - it('should be able to reset `data`', async () => { function Page() { const mutation = useMutation(() => ({ diff --git a/packages/solid-query/src/__tests__/useQueries.test.tsx b/packages/solid-query/src/__tests__/useQueries.test.tsx index c3838e94f8b..6f48af7861e 100644 --- a/packages/solid-query/src/__tests__/useQueries.test.tsx +++ b/packages/solid-query/src/__tests__/useQueries.test.tsx @@ -27,17 +27,20 @@ import type { } from '..' describe('useQueries', () => { + let queryCache: QueryCache + let queryClient: QueryClient + beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) - it('should return the correct states', async () => { const key1 = queryKey() const key2 = queryKey() diff --git a/packages/solid-query/src/__tests__/useQuery.test.tsx b/packages/solid-query/src/__tests__/useQuery.test.tsx index 490426dcb74..d001fbaf5dd 100644 --- a/packages/solid-query/src/__tests__/useQuery.test.tsx +++ b/packages/solid-query/src/__tests__/useQuery.test.tsx @@ -44,15 +44,18 @@ import type { Mock } from 'vitest' import type { JSX } from 'solid-js' describe('useQuery', () => { - const queryCache = new QueryCache() - const queryClient = new QueryClient({ queryCache }) + let queryCache: QueryCache + let queryClient: QueryClient beforeEach(() => { vi.useFakeTimers() + queryCache = new QueryCache() + queryClient = new QueryClient({ queryCache }) }) afterEach(() => { vi.useRealTimers() + queryClient.clear() }) it('should return the correct types', () => {