diff --git a/packages/solid-query-devtools/src/__tests__/devtools.test.tsx b/packages/solid-query-devtools/src/__tests__/devtools.test.tsx index 26da91a25a..81eda46ba4 100644 --- a/packages/solid-query-devtools/src/__tests__/devtools.test.tsx +++ b/packages/solid-query-devtools/src/__tests__/devtools.test.tsx @@ -149,7 +149,6 @@ describe('SolidQueryDevtools', () => { setButtonPosition.mockClear() setButtonPositionSignal('top-left') - expect(setButtonPosition).toHaveBeenCalledWith('top-left') }) @@ -164,7 +163,6 @@ describe('SolidQueryDevtools', () => { setPosition.mockClear() setPositionSignal('top') - expect(setPosition).toHaveBeenCalledWith('top') }) @@ -184,7 +182,6 @@ describe('SolidQueryDevtools', () => { setInitialIsOpen.mockClear() setInitialIsOpenSignal(true) - expect(setInitialIsOpen).toHaveBeenCalledWith(true) }) @@ -206,7 +203,6 @@ describe('SolidQueryDevtools', () => { { name: 'Network', initializer: () => new Error('Network') }, ] setErrorTypesSignal(nextErrorTypes) - expect(setErrorTypes).toHaveBeenCalledWith(nextErrorTypes) }) @@ -218,7 +214,6 @@ describe('SolidQueryDevtools', () => { setTheme.mockClear() setThemeSignal('dark') - expect(setTheme).toHaveBeenCalledWith('dark') }) diff --git a/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx b/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx index f2d904d19f..9da38656f9 100644 --- a/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx +++ b/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx @@ -171,6 +171,7 @@ describe('QueryClientProvider', () => { } render(() => ) + expect(consoleErrorMock).not.toHaveBeenCalled() consoleErrorMock.mockRestore() diff --git a/packages/solid-query/src/__tests__/suspense.test.tsx b/packages/solid-query/src/__tests__/suspense.test.tsx index d61110bb34..bf640eec8f 100644 --- a/packages/solid-query/src/__tests__/suspense.test.tsx +++ b/packages/solid-query/src/__tests__/suspense.test.tsx @@ -163,7 +163,6 @@ describe("useQuery's in Suspense mode", () => { expect(rendered.getByText('rendered')).toBeInTheDocument() await vi.advanceTimersByTimeAsync(20) - expect(queryFn).toHaveBeenCalledTimes(1) }) @@ -653,7 +652,6 @@ describe("useQuery's in Suspense mode", () => { expect(rendered.getByText('loading')).toBeInTheDocument() expect(queryFn).toHaveBeenCalledTimes(0) - await vi.advanceTimersByTimeAsync(10) fireEvent.click(rendered.getByRole('button', { name: /fire/i })) expect(rendered.getByText('loading')).toBeInTheDocument() @@ -885,9 +883,7 @@ describe("useQuery's in Suspense mode", () => { )) expect(rendered.getByText('loading')).toBeInTheDocument() - await vi.advanceTimersByTimeAsync(10) - expect(state).toMatchObject({ data: 1, status: 'success', diff --git a/packages/solid-query/src/__tests__/transition.test.tsx b/packages/solid-query/src/__tests__/transition.test.tsx index 1283e18444..e595904f0d 100644 --- a/packages/solid-query/src/__tests__/transition.test.tsx +++ b/packages/solid-query/src/__tests__/transition.test.tsx @@ -56,8 +56,8 @@ describe("useQuery's in Suspense mode with transitions", () => { const rendered = renderWithClient(queryClient, () => ) expect(rendered.getByText('Show')).toBeInTheDocument() - fireEvent.click(rendered.getByLabelText('toggle')) + fireEvent.click(rendered.getByLabelText('toggle')) await vi.advanceTimersByTimeAsync(10) expect(rendered.getByText('Message')).toBeInTheDocument() // verify that the button also updated. See https://github.com/solidjs/solid/issues/1249 diff --git a/packages/solid-query/src/__tests__/useInfiniteQuery.test.tsx b/packages/solid-query/src/__tests__/useInfiniteQuery.test.tsx index bed8c559ff..e006f448df 100644 --- a/packages/solid-query/src/__tests__/useInfiniteQuery.test.tsx +++ b/packages/solid-query/src/__tests__/useInfiniteQuery.test.tsx @@ -74,7 +74,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toEqual({ data: undefined, @@ -184,7 +183,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(50) - expect(noThrow).toBe(true) }) @@ -309,7 +307,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined, @@ -353,7 +350,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(selectCalled).toBe(1) expect(states[0]).toMatchObject({ @@ -476,7 +472,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(30) - expect(states.length).toBe(4) expect(states[0]).toMatchObject({ data: undefined, @@ -984,7 +979,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(160) - expect(states.length).toBe(5) expect(states[0]).toMatchObject({ hasNextPage: false, @@ -1199,7 +1193,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(60) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ hasNextPage: false, @@ -1256,7 +1249,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(125) - expect(fetches).toBe(2) expect(queryClient.getQueryState(key)).toMatchObject({ data: initialData, @@ -1309,7 +1301,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(70) - expect(states.length).toBe(5) expect(states[0]).toMatchObject({ hasNextPage: false, @@ -1381,7 +1372,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: { pages: [1] }, @@ -1421,7 +1411,6 @@ describe('useInfiniteQuery', () => { const rendered = renderWithClient(queryClient, () => ) expect(rendered.getByText('isFetching: false')).toBeInTheDocument() - await vi.advanceTimersByTimeAsync(11) expect(queryFn).not.toHaveBeenCalled() expect(rendered.getByText('isFetching: false')).toBeInTheDocument() @@ -1473,7 +1462,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(30) - expect(states.length).toBe(4) expect(states[0]).toMatchObject({ data: { pages: [1] }, @@ -1527,7 +1515,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined, @@ -1568,7 +1555,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: { pages: [10] }, @@ -1609,7 +1595,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: { pages: [10] }, @@ -1653,7 +1638,6 @@ describe('useInfiniteQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined, diff --git a/packages/solid-query/src/__tests__/useIsFetching.test.tsx b/packages/solid-query/src/__tests__/useIsFetching.test.tsx index ca5e7d21ab..b96a548733 100644 --- a/packages/solid-query/src/__tests__/useIsFetching.test.tsx +++ b/packages/solid-query/src/__tests__/useIsFetching.test.tsx @@ -119,7 +119,6 @@ describe('useIsFetching', () => { // unlike react, Updating renderSecond wont cause a rerender for FirstQuery await vi.advanceTimersByTimeAsync(300) - expect(isFetchingArray).toEqual([0, 1, 2, 1, 0]) }) @@ -273,7 +272,6 @@ describe('useIsFetching', () => { expect(rendered.getByText('isFetching: 1')).toBeInTheDocument() setClient(queryClient2) - expect(unsubscribe1).toHaveBeenCalledTimes(1) expect(rendered.getByText('isFetching: 0')).toBeInTheDocument() @@ -283,10 +281,8 @@ describe('useIsFetching', () => { }) expect(rendered.getByText('isFetching: 1')).toBeInTheDocument() - await vi.advanceTimersByTimeAsync(20) await Promise.all([firstQuery, secondQuery]) - expect(rendered.getByText('isFetching: 0')).toBeInTheDocument() }) }) diff --git a/packages/solid-query/src/__tests__/useIsMutating.test.tsx b/packages/solid-query/src/__tests__/useIsMutating.test.tsx index 9df166432e..af137d574a 100644 --- a/packages/solid-query/src/__tests__/useIsMutating.test.tsx +++ b/packages/solid-query/src/__tests__/useIsMutating.test.tsx @@ -66,7 +66,6 @@ describe('useIsMutating', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(150) - expect(isMutatingArray).toEqual([0, 1, 2, 1, 0]) }) @@ -107,7 +106,6 @@ describe('useIsMutating', () => { // Unlike React, IsMutating Wont re-render twice with mutation2 await vi.advanceTimersByTimeAsync(100) - expect(isMutatingArray).toEqual([0, 1, 0]) }) @@ -151,7 +149,6 @@ describe('useIsMutating', () => { // Again, No unnecessary re-renders like React await vi.advanceTimersByTimeAsync(100) - expect(isMutatingArray).toEqual([0, 1, 0]) }) @@ -224,7 +221,6 @@ describe('useIsMutating', () => { expect(rendered.getByText('mutating: 1')).toBeInTheDocument() setClient(queryClient2) - expect(unsubscribe1).toHaveBeenCalledTimes(1) expect(rendered.getByText('mutating: 0')).toBeInTheDocument() @@ -234,10 +230,8 @@ describe('useIsMutating', () => { const secondMutationPromise = secondMutation.execute(undefined) expect(rendered.getByText('mutating: 1')).toBeInTheDocument() - await vi.advanceTimersByTimeAsync(20) await Promise.all([firstMutationPromise, secondMutationPromise]) - expect(rendered.getByText('mutating: 0')).toBeInTheDocument() }) diff --git a/packages/solid-query/src/__tests__/useMutation.test.tsx b/packages/solid-query/src/__tests__/useMutation.test.tsx index e92d50771b..1552f1080d 100644 --- a/packages/solid-query/src/__tests__/useMutation.test.tsx +++ b/packages/solid-query/src/__tests__/useMutation.test.tsx @@ -128,7 +128,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) await vi.advanceTimersByTimeAsync(10) - expect(callbacks).toEqual(['mutate.onSuccess', 'mutate.onSettled']) }) @@ -165,7 +164,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) await vi.advanceTimersByTimeAsync(10) - expect(callbacks).toEqual(['mutate.onError', 'mutate.onSettled']) }) @@ -196,7 +194,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) await vi.advanceTimersByTimeAsync(10) - expect(callbacks).toEqual(['mutate.onSuccess']) }) @@ -230,7 +227,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) await vi.advanceTimersByTimeAsync(10) - expect(callbacks).toEqual(['mutate.onError']) }) @@ -261,7 +257,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) await vi.advanceTimersByTimeAsync(10) - expect(callbacks).toEqual(['mutate.onSettled']) }) @@ -293,7 +288,6 @@ describe('useMutation', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(callbacks).toEqual([ 'mutateAsync.onSuccess', 'mutateAsync.onSettled', @@ -333,7 +327,6 @@ describe('useMutation', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(callbacks).toEqual(['mutateAsync.onError', 'mutateAsync.onSettled']) }) @@ -362,7 +355,6 @@ describe('useMutation', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(callbacks).toEqual(['mutateAsync.onSuccess']) }) @@ -396,7 +388,6 @@ describe('useMutation', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(callbacks).toEqual(['mutateAsync.onError']) }) @@ -425,7 +416,6 @@ describe('useMutation', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(callbacks).toEqual(['mutateAsync.onSettled']) }) @@ -654,7 +644,6 @@ describe('useMutation', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(callbacks).toEqual([ 'useMutation.onSuccess', 'useMutation.onSettled', @@ -703,7 +692,6 @@ describe('useMutation', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(callbacks).toEqual([ 'useMutation.onError', 'useMutation.onSettled', @@ -744,7 +732,6 @@ describe('useMutation', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(20) - expect(states.length).toBe(3) expect(states[0]).toMatchObject({ data: undefined, isPending: false }) expect(states[1]).toMatchObject({ data: undefined, isPending: true }) @@ -777,7 +764,6 @@ describe('useMutation', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(20) - expect(count).toBe(2) }) @@ -819,7 +805,6 @@ describe('useMutation', () => { window.dispatchEvent(new Event('offline')) fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) - expect( rendered.getByText('error: null, status: pending, isPaused: true'), ).toBeInTheDocument() @@ -928,6 +913,7 @@ describe('useMutation', () => { const rendered = renderWithClient(queryClient, () => ) rendered.getByText('data: null, status: idle, isPaused: false') + fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) expect( rendered.getByText('data: null, status: pending, isPaused: true'), @@ -986,7 +972,6 @@ describe('useMutation', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(16) - expect(states.length).toBe(4) expect(states[0]).toMatchObject({ isPending: false, @@ -1017,7 +1002,6 @@ describe('useMutation', () => { window.dispatchEvent(new Event('online')) await vi.advanceTimersByTimeAsync(1) - expect(states.length).toBe(6) expect(states[4]).toMatchObject({ isPending: true, @@ -1336,10 +1320,8 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) - await vi.advanceTimersByTimeAsync(10) await rendered.findByText('data: result2, status: success') - expect(count).toBe(2) expect(onSuccess).toHaveBeenCalledTimes(2) @@ -1388,10 +1370,8 @@ describe('useMutation', () => { await rendered.findByText('status: idle') rendered.getByRole('button', { name: /mutate/i }).click() - await vi.advanceTimersByTimeAsync(10) await rendered.findByText('status: error') - expect(onError).toHaveBeenCalledWith(error, 'todo', undefined, { client: queryClient, meta: undefined, @@ -1563,11 +1543,8 @@ describe('useMutation', () => { // The optimistic value lands after onMutate's first await, so flush // microtasks before asserting. await vi.advanceTimersByTimeAsync(0) - expect(queryClient.getQueryData(key)).toEqual(['Todo 1', 'Todo 2']) - await vi.advanceTimersByTimeAsync(11) - expect(queryClient.getQueryData(key)).toEqual(['Todo 1']) }) @@ -1598,7 +1575,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /add/i })) await vi.advanceTimersByTimeAsync(11) - expect(queryClient.getQueryData(key)).toEqual(['Todo 1', 'Todo 2']) }) @@ -1633,7 +1609,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /upload all/i })) await vi.advanceTimersByTimeAsync(11) - expect( rendered.getByText( 'result: uploaded: file1, uploaded: file2, uploaded: file3', @@ -1683,7 +1658,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /upload all/i })) await vi.advanceTimersByTimeAsync(11) - expect( rendered.getByText('result: error: upload failed'), ).toBeInTheDocument() @@ -1734,7 +1708,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /upload all/i })) await vi.advanceTimersByTimeAsync(11) - expect( rendered.getByText( 'result: uploaded: file1, error: upload failed, uploaded: file3', @@ -1759,7 +1732,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) await vi.advanceTimersByTimeAsync(10) - expect(onSuccess).toHaveBeenCalledTimes(1) const [data, variables, onMutateResult, context] = onSuccess.mock.calls[0]! expect(data).toBe('TODO') @@ -1792,7 +1764,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) await vi.advanceTimersByTimeAsync(11) - expect(rendered.getByText('data: tag-from-this-client')).toBeInTheDocument() }) @@ -1813,7 +1784,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) await vi.advanceTimersByTimeAsync(10) - expect(onSuccess).toHaveBeenCalledTimes(1) expect(onSuccess.mock.calls[0]?.[3].mutationKey).toEqual(['todos', 'add']) }) @@ -1839,7 +1809,6 @@ describe('useMutation', () => { fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) await vi.advanceTimersByTimeAsync(10) - expect(queryClient.getQueryState(key)?.isInvalidated).toBe(true) }) }) diff --git a/packages/solid-query/src/__tests__/useMutationState.test.tsx b/packages/solid-query/src/__tests__/useMutationState.test.tsx index 8bc837fb8f..9f463c3aea 100644 --- a/packages/solid-query/src/__tests__/useMutationState.test.tsx +++ b/packages/solid-query/src/__tests__/useMutationState.test.tsx @@ -56,7 +56,6 @@ describe('useMutationState', () => { fireEvent.click(rendered.getByRole('button', { name: /mutate/i })) await vi.advanceTimersByTimeAsync(0) expect(rendered.getByText('count: 1')).toBeInTheDocument() - await vi.advanceTimersByTimeAsync(150) expect(rendered.getByText('count: 1')).toBeInTheDocument() }) diff --git a/packages/solid-query/src/__tests__/useQueries.test.tsx b/packages/solid-query/src/__tests__/useQueries.test.tsx index acc344782f..f521ca74b5 100644 --- a/packages/solid-query/src/__tests__/useQueries.test.tsx +++ b/packages/solid-query/src/__tests__/useQueries.test.tsx @@ -192,7 +192,6 @@ describe('useQueries', () => { )) await vi.advanceTimersByTimeAsync(0) - expect(rendered.getByTestId('status1')).toHaveTextContent('pending') expect(rendered.getByTestId('status2')).toHaveTextContent('pending') expect(rendered.getByTestId('fetchStatus1')).toHaveTextContent('idle') @@ -201,9 +200,7 @@ describe('useQueries', () => { expect(rendered.getByTestId('data2')).toHaveTextContent('undefined') expect(queryFn1).toHaveBeenCalledTimes(0) expect(queryFn2).toHaveBeenCalledTimes(0) - await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByTestId('status1')).toHaveTextContent('pending') expect(rendered.getByTestId('status2')).toHaveTextContent('pending') expect(rendered.getByTestId('fetchStatus1')).toHaveTextContent('idle') diff --git a/packages/solid-query/src/__tests__/useQuery.test.tsx b/packages/solid-query/src/__tests__/useQuery.test.tsx index 3a753409de..e09bdb4459 100644 --- a/packages/solid-query/src/__tests__/useQuery.test.tsx +++ b/packages/solid-query/src/__tests__/useQuery.test.tsx @@ -444,7 +444,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined }) expect(states[1]).toMatchObject({ data: 'data' }) @@ -494,7 +493,6 @@ describe('useQuery', () => { expect(rendered.getByText('data: 1')).toBeInTheDocument() fireEvent.click(rendered.getByRole('button', { name: /toggle/i })) - await vi.advanceTimersByTimeAsync(10) expect(rendered.getByText('data: 2')).toBeInTheDocument() @@ -544,7 +542,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined }) expect(states[1]).toMatchObject({ data: 'test' }) @@ -571,7 +568,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(1) expect(states[0]).toMatchObject({ data: 'prefetched' }) }) @@ -595,7 +591,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined }) expect(states[1]).toMatchObject({ data: 'test' }) @@ -620,7 +615,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined }) expect(states[1]).toMatchObject({ data: 'test' }) @@ -645,7 +639,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined }) expect(states[1]).toMatchObject({ data: 'test' }) @@ -710,7 +703,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ status: 'pending', data: undefined }) @@ -751,7 +743,6 @@ describe('useQuery', () => { const rendered = renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('test')).toBeInTheDocument() expect(states.length).toBe(2) @@ -793,7 +784,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(renderCount).toBe(2) expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined }) @@ -1079,7 +1069,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(30) - expect(states.length).toBe(1) expect(states[0]).toMatchObject({ data: undefined, @@ -1121,7 +1110,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(30) - expect(states.length).toBe(1) expect(states[0]).toMatchObject({ data: undefined, @@ -1160,7 +1148,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(3) // Fetch query @@ -1210,7 +1197,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(30) - expect(states.length).toBe(4) // Initial @@ -1278,6 +1264,7 @@ describe('useQuery', () => { expect( rendered.getByText('data: 0, count: 0, isFetching: false'), ).toBeInTheDocument() + fireEvent.click(rendered.getByRole('button', { name: 'inc' })) await vi.advanceTimersByTimeAsync(10) expect( @@ -1356,7 +1343,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(50) - expect(states.length).toBe(4) // Disabled query @@ -1432,9 +1418,9 @@ describe('useQuery', () => { await vi.advanceTimersByTimeAsync(10) expect(rendered.getByText('data: 1')).toBeInTheDocument() + fireEvent.click(rendered.getByRole('button', { name: /refetch/i })) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(4) expect(states[0]).toMatchObject({ @@ -1501,7 +1487,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(200) - expect(states1.length).toBe(4) expect(states2.length).toBe(3) @@ -1566,7 +1551,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(70) - expect(states.length).toBe(3) expect(states[0]).toMatchObject({ isStale: true }) expect(states[1]).toMatchObject({ isStale: false }) @@ -1600,7 +1584,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(15) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined, @@ -1713,7 +1696,6 @@ describe('useQuery', () => { const rendered = renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('new')).toBeInTheDocument() }) @@ -1832,7 +1814,6 @@ describe('useQuery', () => { window.dispatchEvent(new Event('visibilitychange')) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined, isFetching: true }) expect(states[1]).toMatchObject({ data: 0, isFetching: false }) @@ -1861,7 +1842,6 @@ describe('useQuery', () => { window.dispatchEvent(new Event('visibilitychange')) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined, isFetching: true }) expect(states[1]).toMatchObject({ data: 0, isFetching: false }) @@ -1890,7 +1870,6 @@ describe('useQuery', () => { window.dispatchEvent(new Event('visibilitychange')) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: undefined, isFetching: true }) expect(states[1]).toMatchObject({ data: 0, isFetching: false }) @@ -1920,7 +1899,6 @@ describe('useQuery', () => { window.dispatchEvent(new Event('visibilitychange')) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(4) expect(states[0]).toMatchObject({ data: undefined, isFetching: true }) expect(states[1]).toMatchObject({ data: 0, isFetching: false }) @@ -1950,7 +1928,6 @@ describe('useQuery', () => { const rendered = renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('data: 0')).toBeInTheDocument() expect(states.length).toBe(2) @@ -1960,7 +1937,6 @@ describe('useQuery', () => { window.dispatchEvent(new Event('visibilitychange')) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('data: 1')).toBeInTheDocument() // refetch should happen @@ -2005,7 +1981,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: 'prefetched', @@ -2047,7 +2022,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: 'prefetched', @@ -2379,7 +2353,6 @@ describe('useQuery', () => { const rendered = renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('failureCount: 1')).toBeInTheDocument() expect(rendered.getByText('failureReason: some error')).toBeInTheDocument() @@ -2395,7 +2368,6 @@ describe('useQuery', () => { // Wait for third attempt await vi.advanceTimersByTimeAsync(100) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('error: some error')).toBeInTheDocument() expect(count).toBe(3) @@ -2445,14 +2417,13 @@ describe('useQuery', () => { const rendered = renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('failureCount: 1')).toBeInTheDocument() expect(rendered.getByText('failureReason: some error')).toBeInTheDocument() fireEvent.click(rendered.getByRole('button', { name: /hide/i })) fireEvent.click(rendered.getByRole('button', { name: /cancel/i })) - expect(rendered.getByRole('button', { name: /show/i })).toBeInTheDocument() + fireEvent.click(rendered.getByRole('button', { name: /show/i })) // Wait for new mount fetch @@ -2465,7 +2436,6 @@ describe('useQuery', () => { // Wait for second retry await vi.advanceTimersByTimeAsync(100) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('error: some error')).toBeInTheDocument() // initial fetch (1), which will be cancelled, followed by new mount(2) + 2 retries = 4 @@ -2507,9 +2477,7 @@ describe('useQuery', () => { await vi.advanceTimersByTimeAsync(10) expect(rendered.getByText('data: data')).toBeInTheDocument() - await vi.advanceTimersByTimeAsync(60) - expect(states.length).toBe(3) expect(states[0]).toMatchObject({ @@ -2548,7 +2516,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ @@ -2584,7 +2551,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: 'initial', isError: false }) expect(states[1]).toMatchObject({ data: 'initial', isError: true }) @@ -2610,7 +2576,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(60) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: 'initial', @@ -2647,7 +2612,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(70) - expect(states.length).toBe(3) expect(states[0]).toMatchObject({ data: 'initial', @@ -2687,7 +2651,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states[0]).toMatchObject({ data: 'initial', @@ -2730,7 +2693,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) // Initial expect(states[0]).toMatchObject({ data: { count: 0 } }) @@ -2906,10 +2868,8 @@ describe('useQuery', () => { // The query should display the first error result await vi.advanceTimersByTimeAsync(11) - expect(rendered.getByText('failureCount 1')).toBeInTheDocument() await vi.advanceTimersByTimeAsync(11) - expect( rendered.getByText('failureReason fetching error 1'), ).toBeInTheDocument() @@ -2917,7 +2877,6 @@ describe('useQuery', () => { expect(rendered.getByText('error null')).toBeInTheDocument() // Check if the query really paused await vi.advanceTimersByTimeAsync(11) - expect(rendered.getByText('failureCount 1')).toBeInTheDocument() expect( @@ -2934,7 +2893,6 @@ describe('useQuery', () => { await vi.advanceTimersByTimeAsync(11) // 4th retry (final): 1ms (retryDelay) + 10ms (queryFn) await vi.advanceTimersByTimeAsync(11) - expect(rendered.getByText('failureCount 4')).toBeInTheDocument() expect( @@ -2946,7 +2904,6 @@ describe('useQuery', () => { expect(rendered.getByText('error fetching error 4')).toBeInTheDocument() // Check if the query really stopped await vi.advanceTimersByTimeAsync(11) - expect(rendered.getByText('failureCount 4')).toBeInTheDocument() expect( rendered.getByText('failureReason fetching error 4'), @@ -2973,7 +2930,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(states).toMatchObject([ { @@ -3017,7 +2973,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) // reset visibilityState to original value @@ -3025,7 +2980,6 @@ describe('useQuery', () => { window.dispatchEvent(new Event('visibilitychange')) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(4) expect(states).toMatchObject([ @@ -3083,7 +3037,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(states.length).toBe(2) expect(prefetchQueryFn).toHaveBeenCalledTimes(1) @@ -3117,7 +3070,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(prefetchQueryFn).toHaveBeenCalledTimes(1) expect(queryFn).toHaveBeenCalledTimes(0) }) @@ -3403,7 +3355,6 @@ describe('useQuery', () => { const rendered = renderWithClient(queryClient, () => ) expect(rendered.getByText('data: initialData')).toBeInTheDocument() - await vi.advanceTimersByTimeAsync(10) expect(rendered.getByText('data: serverData')).toBeInTheDocument() @@ -3433,7 +3384,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(results.length).toBe(2) expect(results[0]).toMatchObject({ data: 0, isFetching: true }) expect(results[1]).toMatchObject({ data: 1, isFetching: false }) @@ -3470,7 +3420,6 @@ describe('useQuery', () => { renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(15) - expect(results.length).toBe(3) expect(results[0]).toMatchObject({ data: 'initial', isStale: true }) expect(results[1]).toMatchObject({ data: 'fetched data', isStale: true }) @@ -3540,7 +3489,6 @@ describe('useQuery', () => { const rendered = renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('fetched data')).toBeInTheDocument() const setTimeoutSpy = vi.spyOn(window, 'setTimeout') @@ -3564,7 +3512,6 @@ describe('useQuery', () => { const rendered = renderWithClient(queryClient, () => ) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('fetched data')).toBeInTheDocument() const setTimeoutSpy = vi.spyOn(window, 'setTimeout') @@ -3607,7 +3554,6 @@ describe('useQuery', () => { const rendered = renderWithClient(queryClient, () => ) expect(rendered.getByText('status pending')).toBeInTheDocument() - await vi.advanceTimersByTimeAsync(10) expect(rendered.getByText('status success')).toBeInTheDocument() @@ -3693,7 +3639,6 @@ describe('useQuery', () => { // Second interval (10ms delay + 10ms fetch) await vi.advanceTimersByTimeAsync(10) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('count: 2')).toBeInTheDocument() expect(states.length).toEqual(6) @@ -3757,7 +3702,6 @@ describe('useQuery', () => { // extra advance to make sure we're not re-fetching await vi.advanceTimersByTimeAsync(100) - expect(states.length).toEqual(2) expect(states).toMatchObject([ @@ -4084,6 +4028,7 @@ describe('useQuery', () => { expect(rendered.getByText('Data: selected 101')).toBeInTheDocument() await vi.advanceTimersByTimeAsync(10) expect(rendered.getByText('Data: selected 2')).toBeInTheDocument() + fireEvent.click(rendered.getByRole('button', { name: /inc/i })) expect(rendered.getByText('Data: selected 3')).toBeInTheDocument() @@ -4264,7 +4209,6 @@ describe('useQuery', () => { await vi.advanceTimersByTimeAsync(10) expect(rendered.getByText('off')).toBeInTheDocument() await vi.advanceTimersByTimeAsync(15) - expect(states).toHaveLength(4) expect(queryCache.find({ queryKey: [key, 0] })?.state).toMatchObject({ @@ -4560,14 +4504,12 @@ describe('useQuery', () => { // // render error state component await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('error')).toBeInTheDocument() expect(queryFn).toHaveBeenCalledTimes(1) // change to enabled to false fireEvent.click(rendered.getByLabelText('retry')) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('error')).toBeInTheDocument() expect(queryFn).toHaveBeenCalledTimes(1) @@ -4932,7 +4874,9 @@ describe('useQuery', () => { expect( rendered.getByText('status: success, fetchStatus: paused'), ).toBeInTheDocument() + window.dispatchEvent(new Event('visibilitychange')) + await vi.advanceTimersByTimeAsync(10) expect(rendered.queryByText('data: data2')).not.toBeInTheDocument() expect(count).toBe(1) @@ -4975,6 +4919,7 @@ describe('useQuery', () => { expect( rendered.getByText('status: pending, fetchStatus: paused'), ).toBeInTheDocument() + fireEvent.click(rendered.getByRole('button', { name: /invalidate/i })) // invalidation should not trigger a refetch await vi.advanceTimersByTimeAsync(10) @@ -5078,9 +5023,7 @@ describe('useQuery', () => { // triggers one pause fireEvent.click(rendered.getByRole('button', { name: /invalidate/i })) - await vi.advanceTimersByTimeAsync(10) - expect( rendered.getByText('status: success, fetchStatus: paused'), ).toBeInTheDocument() @@ -5395,13 +5338,13 @@ describe('useQuery', () => { expect( rendered.getByText('status: success, fetchStatus: paused'), ).toBeInTheDocument() + fireEvent.click(rendered.getByRole('button', { name: /hide/i })) onlineMock.mockReturnValue(true) queryClient.getQueryCache().onOnline() await vi.advanceTimersByTimeAsync(10) - expect(queryClient.getQueryState(key)).toMatchObject({ fetchStatus: 'idle', status: 'success', @@ -5486,7 +5429,6 @@ describe('useQuery', () => { await vi.advanceTimersByTimeAsync(10) await vi.advanceTimersByTimeAsync(10) await vi.advanceTimersByTimeAsync(10) - expect( rendered.getByText('status: error, isPaused: false'), ).toBeInTheDocument() @@ -5538,7 +5480,6 @@ describe('useQuery', () => { // First retry is scheduled but paused due to offline await vi.advanceTimersByTimeAsync(10) await vi.advanceTimersByTimeAsync(1) - expect( rendered.getByText( 'status: pending, fetchStatus: paused, failureCount: 1', @@ -5557,7 +5498,6 @@ describe('useQuery', () => { await vi.advanceTimersByTimeAsync(10) await vi.advanceTimersByTimeAsync(10) await vi.advanceTimersByTimeAsync(10) - expect( rendered.getByText('status: error, fetchStatus: idle, failureCount: 3'), ).toBeInTheDocument() @@ -5662,9 +5602,11 @@ describe('useQuery', () => { await vi.advanceTimersByTimeAsync(10) expect(rendered.getByText('data: 1')).toBeInTheDocument() + fireEvent.click(fetchBtn) await vi.advanceTimersByTimeAsync(10) expect(rendered.getByText('data: 2')).toBeInTheDocument() + fireEvent.click(fetchBtn) await vi.advanceTimersByTimeAsync(10) expect(rendered.getByText('data: 3')).toBeInTheDocument() @@ -5700,7 +5642,6 @@ describe('useQuery', () => { )) await vi.advanceTimersByTimeAsync(0) - expect(rendered.getByTestId('status')).toHaveTextContent('pending') expect(rendered.getByTestId('fetchStatus')).toHaveTextContent('idle') expect(rendered.getByTestId('data')).toHaveTextContent('undefined') @@ -5709,7 +5650,6 @@ describe('useQuery', () => { // Restoring complete: should refetch setIsRestoring(false) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByTestId('status')).toHaveTextContent('success') expect(rendered.getByTestId('fetchStatus')).toHaveTextContent('idle') expect(rendered.getByTestId('data')).toHaveTextContent('data') @@ -5765,7 +5705,6 @@ describe('useQuery', () => { const rendered = render(() => ) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('status: success')).toBeInTheDocument() expect( queryClient1.getQueryCache().find({ queryKey: key })?.state.data, @@ -5774,7 +5713,6 @@ describe('useQuery', () => { setClient(queryClient2) await vi.advanceTimersByTimeAsync(10) - expect(rendered.getByText('status: success')).toBeInTheDocument() expect(queryClient2.getQueryCache().find({ queryKey: key })).toBeDefined() expect(queryFn).toHaveBeenCalledTimes(2) @@ -5803,7 +5741,6 @@ describe('useQuery', () => { const rendered = renderWithClient(queryClient, () => ) expect(rendered.getByText('data: none')).toBeInTheDocument() - await vi.advanceTimersByTimeAsync(10) expect(queryFn).not.toHaveBeenCalled() expect(rendered.getByText('data: none')).toBeInTheDocument()