Skip to content

Commit 4eb924a

Browse files
authored
Merge branch 'main' into test/react-query-useSuspenseQuery-fake-timers-vi-waitFor
2 parents bc8adda + 026c050 commit 4eb924a

File tree

6 files changed

+155
-140
lines changed

6 files changed

+155
-140
lines changed

.github/workflows/autofix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Tools
2323
uses: tanstack/config/.github/setup@main
2424
- name: Fix formatting
25-
run: pnpm prettier:write
25+
run: pnpm run prettier:write
2626
- name: Apply fixes
2727
uses: autofix-ci/action@635ffb0c9798bd160680f18fd73371e355b85f27
2828
with:

packages/react-query/src/__tests__/QueryClientProvider.test.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ describe('QueryClientProvider', () => {
4343
</QueryClientProvider>,
4444
)
4545

46-
await vi.waitFor(() => rendered.getByText('test'))
46+
await vi.advanceTimersByTimeAsync(11)
47+
rendered.getByText('test')
4748

4849
expect(queryCache.find({ queryKey: key })).toBeDefined()
4950
})
@@ -94,8 +95,9 @@ describe('QueryClientProvider', () => {
9495
</>,
9596
)
9697

97-
await vi.waitFor(() => rendered.getByText('test1'))
98-
await vi.waitFor(() => rendered.getByText('test2'))
98+
await vi.advanceTimersByTimeAsync(11)
99+
rendered.getByText('test1')
100+
rendered.getByText('test2')
99101

100102
expect(queryCache1.find({ queryKey: key1 })).toBeDefined()
101103
expect(queryCache1.find({ queryKey: key2 })).not.toBeDefined()
@@ -135,7 +137,8 @@ describe('QueryClientProvider', () => {
135137
</QueryClientProvider>,
136138
)
137139

138-
await vi.waitFor(() => rendered.getByText('test'))
140+
await vi.advanceTimersByTimeAsync(11)
141+
rendered.getByText('test')
139142

140143
expect(queryCache.find({ queryKey: key })).toBeDefined()
141144
expect(queryCache.find({ queryKey: key })?.options.gcTime).toBe(Infinity)

packages/react-query/src/__tests__/fine-grained-persister.test.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ describe('fine grained persister', () => {
6868

6969
const rendered = renderWithClient(queryClient, <Test />)
7070

71-
await vi.waitFor(() => rendered.getByText('Works from persister'))
71+
await vi.advanceTimersByTimeAsync(0)
72+
rendered.getByText('Works from persister')
7273
expect(spy).not.toHaveBeenCalled()
7374
})
7475

@@ -123,8 +124,10 @@ describe('fine grained persister', () => {
123124

124125
const rendered = renderWithClient(queryClient, <Test />)
125126

126-
await vi.waitFor(() => rendered.getByText('Works from persister'))
127-
await vi.waitFor(() => rendered.getByText('Works from queryFn'))
127+
await vi.advanceTimersByTimeAsync(5)
128+
rendered.getByText('Works from persister')
129+
await vi.advanceTimersByTimeAsync(1)
130+
rendered.getByText('Works from queryFn')
128131
expect(spy).toHaveBeenCalledTimes(1)
129132
})
130133

@@ -162,7 +165,8 @@ describe('fine grained persister', () => {
162165

163166
const rendered = renderWithClient(queryClient, <Test />)
164167

165-
await vi.waitFor(() => rendered.getByText('Works from queryFn'))
168+
await vi.advanceTimersByTimeAsync(0)
169+
rendered.getByText('Works from queryFn')
166170
expect(spy).toHaveBeenCalledTimes(1)
167171

168172
const storedItem = await storage.getItem(`${PERSISTER_KEY_PREFIX}-${hash}`)

0 commit comments

Comments
 (0)