@@ -30,8 +30,11 @@ describe('queriesObserver', () => {
30
30
const unsubscribe = observer . subscribe ( ( result ) => {
31
31
observerResult = result
32
32
} )
33
- await vi . advanceTimersByTimeAsync ( 1 )
33
+
34
+ await vi . advanceTimersByTimeAsync ( 0 )
35
+
34
36
unsubscribe ( )
37
+
35
38
expect ( observerResult ) . toMatchObject ( [ { data : 1 } , { data : 2 } ] )
36
39
} )
37
40
@@ -49,10 +52,11 @@ describe('queriesObserver', () => {
49
52
const unsubscribe = observer . subscribe ( ( result ) => {
50
53
results . push ( result )
51
54
} )
52
- await vi . advanceTimersByTimeAsync ( 1 )
55
+
56
+ await vi . advanceTimersByTimeAsync ( 0 )
53
57
queryClient . setQueryData ( key2 , 3 )
54
- await vi . advanceTimersByTimeAsync ( 1 )
55
58
unsubscribe ( )
59
+
56
60
expect ( results . length ) . toBe ( 6 )
57
61
expect ( results [ 0 ] ) . toMatchObject ( [
58
62
{ status : 'pending' , fetchStatus : 'idle' , data : undefined } ,
@@ -94,10 +98,12 @@ describe('queriesObserver', () => {
94
98
const unsubscribe = observer . subscribe ( ( result ) => {
95
99
results . push ( result )
96
100
} )
97
- await vi . advanceTimersByTimeAsync ( 1 )
101
+
102
+ await vi . advanceTimersByTimeAsync ( 0 )
98
103
observer . setQueries ( [ { queryKey : key2 , queryFn : queryFn2 } ] )
99
- await vi . advanceTimersByTimeAsync ( 1 )
104
+
100
105
const queryCache = queryClient . getQueryCache ( )
106
+
101
107
expect ( queryCache . find ( { queryKey : key1 , type : 'active' } ) ) . toBeUndefined ( )
102
108
expect ( queryCache . find ( { queryKey : key2 , type : 'active' } ) ) . toBeDefined ( )
103
109
unsubscribe ( )
@@ -141,13 +147,15 @@ describe('queriesObserver', () => {
141
147
const unsubscribe = observer . subscribe ( ( result ) => {
142
148
results . push ( result )
143
149
} )
144
- await vi . advanceTimersByTimeAsync ( 1 )
150
+
151
+ await vi . advanceTimersByTimeAsync ( 0 )
145
152
observer . setQueries ( [
146
153
{ queryKey : key2 , queryFn : queryFn2 } ,
147
154
{ queryKey : key1 , queryFn : queryFn1 } ,
148
155
] )
149
- await vi . advanceTimersByTimeAsync ( 1 )
156
+
150
157
unsubscribe ( )
158
+
151
159
expect ( results . length ) . toBe ( 6 )
152
160
expect ( results [ 0 ] ) . toMatchObject ( [
153
161
{ status : 'pending' , fetchStatus : 'idle' , data : undefined } ,
@@ -189,13 +197,15 @@ describe('queriesObserver', () => {
189
197
const unsubscribe = observer . subscribe ( ( result ) => {
190
198
results . push ( result )
191
199
} )
192
- await vi . advanceTimersByTimeAsync ( 1 )
200
+
201
+ await vi . advanceTimersByTimeAsync ( 0 )
193
202
observer . setQueries ( [
194
203
{ queryKey : key1 , queryFn : queryFn1 } ,
195
204
{ queryKey : key2 , queryFn : queryFn2 } ,
196
205
] )
197
- await vi . advanceTimersByTimeAsync ( 1 )
206
+
198
207
unsubscribe ( )
208
+
199
209
expect ( results . length ) . toBe ( 5 )
200
210
expect ( results [ 0 ] ) . toMatchObject ( [
201
211
{ status : 'pending' , fetchStatus : 'idle' , data : undefined } ,
@@ -219,7 +229,7 @@ describe('queriesObserver', () => {
219
229
] )
220
230
} )
221
231
222
- test ( 'should trigger all fetches when subscribed' , async ( ) => {
232
+ test ( 'should trigger all fetches when subscribed' , ( ) => {
223
233
const key1 = queryKey ( )
224
234
const key2 = queryKey ( )
225
235
const queryFn1 = vi . fn ( ) . mockReturnValue ( 1 )
@@ -228,9 +238,11 @@ describe('queriesObserver', () => {
228
238
{ queryKey : key1 , queryFn : queryFn1 } ,
229
239
{ queryKey : key2 , queryFn : queryFn2 } ,
230
240
] )
241
+
231
242
const unsubscribe = observer . subscribe ( ( ) => undefined )
232
- await vi . advanceTimersByTimeAsync ( 1 )
243
+
233
244
unsubscribe ( )
245
+
234
246
expect ( queryFn1 ) . toHaveBeenCalledTimes ( 1 )
235
247
expect ( queryFn2 ) . toHaveBeenCalledTimes ( 1 )
236
248
} )
@@ -254,7 +266,9 @@ describe('queriesObserver', () => {
254
266
const unsubscribe2 = observer . subscribe ( subscription2Handler )
255
267
256
268
unsubscribe1 ( )
269
+
257
270
await vi . advanceTimersByTimeAsync ( 20 )
271
+
258
272
// 1 call: pending
259
273
expect ( subscription1Handler ) . toBeCalledTimes ( 1 )
260
274
// 1 call: success
@@ -277,6 +291,7 @@ describe('queriesObserver', () => {
277
291
] )
278
292
279
293
const results : Array < Array < QueryObserverResult > > = [ ]
294
+
280
295
results . push (
281
296
observer . getOptimisticResult (
282
297
[
@@ -292,7 +307,8 @@ describe('queriesObserver', () => {
292
307
results . push ( result )
293
308
} )
294
309
295
- await vi . advanceTimersByTimeAsync ( 1 )
310
+ await vi . advanceTimersByTimeAsync ( 0 )
311
+
296
312
unsubscribe ( )
297
313
298
314
expect ( results . length ) . toBe ( 6 )
0 commit comments