Skip to content

test(react-query/QueryResetErrorBoundary): remove 'vi.waitFor' and add 'advanceTimersByTimeAsync' #9365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 6, 2025
Merged

test(react-query/QueryResetErrorBoundary): remove 'vi.waitFor' and add 'advanceTimersByTimeAsync' #9365

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7ef856
test(react-query/QueryResetErrorBoundary): remove 'vi.waitFor' and ad…
sukvvon Jul 6, 2025
d2778c7
Merge branch 'main' into test/react-query-QueryResetErrorBoundary-add…
manudeli Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 69 additions & 101 deletions packages/react-query/src/__tests__/QueryResetErrorBoundary.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { fireEvent } from '@testing-library/react'
import { act, fireEvent } from '@testing-library/react'
import { ErrorBoundary } from 'react-error-boundary'
import * as React from 'react'
import { queryKey, sleep } from '@tanstack/query-test-utils'
Expand Down Expand Up @@ -77,17 +77,13 @@ describe('QueryErrorResetBoundary', () => {
</QueryErrorResetBoundary>,
)

await vi.waitFor(() =>
expect(rendered.getByText('error boundary')).toBeInTheDocument(),
)
await vi.waitFor(() =>
expect(rendered.getByText('retry')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('error boundary')).toBeInTheDocument()
expect(rendered.getByText('retry')).toBeInTheDocument()
succeed = true
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() =>
expect(rendered.getByText('data')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('data')).toBeInTheDocument()
consoleMock.mockRestore()
})

Expand Down Expand Up @@ -147,17 +143,13 @@ describe('QueryErrorResetBoundary', () => {
</QueryErrorResetBoundary>,
)

await vi.waitFor(() =>
expect(rendered.getByText('error boundary')).toBeInTheDocument(),
)
await vi.waitFor(() =>
expect(rendered.getByText('retry')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('error boundary')).toBeInTheDocument()
expect(rendered.getByText('retry')).toBeInTheDocument()
succeed = true
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() =>
expect(rendered.getByText('status: error')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('status: error')).toBeInTheDocument()
consoleMock.mockRestore()
})

Expand Down Expand Up @@ -219,17 +211,13 @@ describe('QueryErrorResetBoundary', () => {
</QueryErrorResetBoundary>,
)

await vi.waitFor(() =>
expect(rendered.getByText('error boundary')).toBeInTheDocument(),
)
await vi.waitFor(() =>
expect(rendered.getByText('retry')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('error boundary')).toBeInTheDocument()
expect(rendered.getByText('retry')).toBeInTheDocument()
succeed = true
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() =>
expect(rendered.getByText('data')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('data')).toBeInTheDocument()
consoleMock.mockRestore()
})

Expand Down Expand Up @@ -285,15 +273,12 @@ describe('QueryErrorResetBoundary', () => {
</QueryErrorResetBoundary>,
)

await vi.waitFor(() =>
expect(
rendered.getByText('status: pending, fetchStatus: idle'),
).toBeInTheDocument(),
)
expect(
rendered.getByText('status: pending, fetchStatus: idle'),
).toBeInTheDocument()
fireEvent.click(rendered.getByRole('button', { name: /refetch/i }))
await vi.waitFor(() =>
expect(rendered.getByText('error boundary')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(0)
expect(rendered.getByText('error boundary')).toBeInTheDocument()
consoleMock.mockRestore()
})

Expand Down Expand Up @@ -347,17 +332,13 @@ describe('QueryErrorResetBoundary', () => {
</QueryErrorResetBoundary>,
)

await vi.waitFor(() =>
expect(rendered.getByText('error boundary')).toBeInTheDocument(),
)
await vi.waitFor(() =>
expect(rendered.getByText('retry')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('error boundary')).toBeInTheDocument()
expect(rendered.getByText('retry')).toBeInTheDocument()
succeed = true
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() =>
expect(rendered.getByText('error boundary')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('error boundary')).toBeInTheDocument()
consoleMock.mockRestore()
})

Expand Down Expand Up @@ -413,17 +394,13 @@ describe('QueryErrorResetBoundary', () => {
</QueryErrorResetBoundary>,
)

await vi.waitFor(() =>
expect(rendered.getByText('error boundary')).toBeInTheDocument(),
)
await vi.waitFor(() =>
expect(rendered.getByText('retry')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('error boundary')).toBeInTheDocument()
expect(rendered.getByText('retry')).toBeInTheDocument()
succeed = true
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() =>
expect(rendered.getByText('data')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('data')).toBeInTheDocument()
consoleMock.mockRestore()
})

Expand Down Expand Up @@ -483,21 +460,18 @@ describe('QueryErrorResetBoundary', () => {
</QueryErrorResetBoundary>,
)

await vi.waitFor(() =>
expect(rendered.getByText('error boundary')).toBeInTheDocument(),
)
await vi.waitFor(() =>
expect(rendered.getByText('retry')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('error boundary')).toBeInTheDocument()
expect(rendered.getByText('retry')).toBeInTheDocument()
shouldReset = true
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() =>
expect(rendered.getByText('error boundary')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('error boundary')).toBeInTheDocument()
succeed = true
shouldReset = false
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() => rendered.getByText('error boundary'))
await vi.advanceTimersByTimeAsync(11)
rendered.getByText('error boundary')
consoleMock.mockRestore()
})

Expand Down Expand Up @@ -548,13 +522,16 @@ describe('QueryErrorResetBoundary', () => {
</QueryErrorResetBoundary>,
)

await vi.waitFor(() => rendered.getByText('error boundary'))
await vi.waitFor(() => rendered.getByText('retry'))
await vi.advanceTimersByTimeAsync(11)
rendered.getByText('error boundary')
rendered.getByText('retry')
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() => rendered.getByText('error boundary'))
await vi.waitFor(() => rendered.getByText('retry'))
await vi.advanceTimersByTimeAsync(11)
rendered.getByText('error boundary')
rendered.getByText('retry')
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() => rendered.getByText('error boundary'))
await vi.advanceTimersByTimeAsync(11)
rendered.getByText('error boundary')
expect(fetchCount).toBe(3)
consoleMock.mockRestore()
})
Expand Down Expand Up @@ -613,13 +590,16 @@ describe('QueryErrorResetBoundary', () => {
</QueryErrorResetBoundary>,
)

await vi.waitFor(() => rendered.getByText('error boundary'))
await vi.waitFor(() => rendered.getByText('retry'))
await act(() => vi.advanceTimersByTimeAsync(11))
rendered.getByText('error boundary')
rendered.getByText('retry')
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() => rendered.getByText('error boundary'))
await vi.waitFor(() => rendered.getByText('retry'))
await act(() => vi.advanceTimersByTimeAsync(11))
rendered.getByText('error boundary')
rendered.getByText('retry')
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() => rendered.getByText('data'))
await act(() => vi.advanceTimersByTimeAsync(11))
rendered.getByText('data')
expect(fetchCount).toBe(3)
expect(renders).toBe(1)
consoleMock.mockRestore()
Expand Down Expand Up @@ -700,17 +680,13 @@ describe('QueryErrorResetBoundary', () => {
</QueryErrorResetBoundary>,
)

await vi.waitFor(() =>
expect(rendered.getByText('error boundary')).toBeInTheDocument(),
)
await vi.waitFor(() =>
expect(rendered.getByText('retry')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('error boundary')).toBeInTheDocument()
expect(rendered.getByText('retry')).toBeInTheDocument()
succeed = true
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() =>
expect(rendered.getByText('data')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('data')).toBeInTheDocument()
consoleMock.mockRestore()
})
})
Expand Down Expand Up @@ -771,17 +747,13 @@ describe('QueryErrorResetBoundary', () => {
</QueryErrorResetBoundary>,
)

await vi.waitFor(() =>
expect(rendered.getByText('error boundary')).toBeInTheDocument(),
)
await vi.waitFor(() =>
expect(rendered.getByText('retry')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('error boundary')).toBeInTheDocument()
expect(rendered.getByText('retry')).toBeInTheDocument()
succeed = true
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() =>
expect(rendered.getByText('data')).toBeInTheDocument(),
)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('data')).toBeInTheDocument()
consoleMock.mockRestore()
})

Expand Down Expand Up @@ -841,17 +813,13 @@ describe('QueryErrorResetBoundary', () => {
</QueryErrorResetBoundary>,
)

await vi.waitFor(() =>
expect(rendered.getByText('error boundary')).toBeInTheDocument(),
)
await vi.waitFor(() =>
expect(rendered.getByText('retry')).toBeInTheDocument(),
)
await act(() => vi.advanceTimersByTimeAsync(11))
expect(rendered.getByText('error boundary')).toBeInTheDocument()
expect(rendered.getByText('retry')).toBeInTheDocument()
succeed = true
fireEvent.click(rendered.getByText('retry'))
await vi.waitFor(() =>
expect(rendered.getByText('data')).toBeInTheDocument(),
)
await act(() => vi.advanceTimersByTimeAsync(11))
expect(rendered.getByText('data')).toBeInTheDocument()
consoleMock.mockRestore()
})
})
Expand Down
Loading