@@ -109,7 +109,8 @@ describe('queryObserver', () => {
109
109
fetchStatus : 'idle' ,
110
110
data : undefined ,
111
111
} )
112
- await vi . waitFor ( ( ) => expect ( count ) . toBe ( 0 ) )
112
+ await vi . advanceTimersByTimeAsync ( 10 )
113
+ expect ( count ) . toBe ( 0 )
113
114
114
115
unsubscribe ( )
115
116
} )
@@ -128,7 +129,8 @@ describe('queryObserver', () => {
128
129
data : undefined ,
129
130
} )
130
131
131
- await vi . waitFor ( ( ) => expect ( count ) . toBe ( 1 ) )
132
+ await vi . advanceTimersByTimeAsync ( 10 )
133
+ expect ( count ) . toBe ( 1 )
132
134
expect ( observer . getCurrentResult ( ) ) . toMatchObject ( {
133
135
status : 'success' ,
134
136
fetchStatus : 'idle' ,
@@ -157,8 +159,8 @@ describe('queryObserver', () => {
157
159
fetchStatus : 'fetching' ,
158
160
data : undefined ,
159
161
} )
160
-
161
- await vi . waitFor ( ( ) => expect ( count ) . toBe ( 1 ) )
162
+ await vi . advanceTimersByTimeAsync ( 10 )
163
+ expect ( count ) . toBe ( 1 )
162
164
163
165
unsubscribe ( )
164
166
} )
@@ -194,7 +196,8 @@ describe('queryObserver', () => {
194
196
fetchStatus : 'fetching' ,
195
197
data : undefined ,
196
198
} )
197
- await vi . waitFor ( ( ) => expect ( count ) . toBe ( 1 ) )
199
+ await vi . advanceTimersByTimeAsync ( 10 )
200
+ expect ( count ) . toBe ( 1 )
198
201
199
202
unsubscribe ( )
200
203
} )
@@ -208,20 +211,23 @@ describe('queryObserver', () => {
208
211
queryClient . invalidateQueries ( { queryKey : key , refetchType : 'inactive' } )
209
212
210
213
// should not refetch since it was active and we only refetch inactive
211
- await vi . waitFor ( ( ) => expect ( count ) . toBe ( 0 ) )
214
+ await vi . advanceTimersByTimeAsync ( 10 )
215
+ expect ( count ) . toBe ( 0 )
212
216
213
217
queryClient . invalidateQueries ( { queryKey : key , refetchType : 'active' } )
214
218
215
219
// should refetch since it was active and we refetch active
216
- await vi . waitFor ( ( ) => expect ( count ) . toBe ( 1 ) )
220
+ await vi . advanceTimersByTimeAsync ( 10 )
221
+ expect ( count ) . toBe ( 1 )
217
222
218
223
// Toggle enabled
219
224
enabled = false
220
225
221
226
// should not refetch since it is not active and we only refetch active
222
227
queryClient . invalidateQueries ( { queryKey : key , refetchType : 'active' } )
223
228
224
- await vi . waitFor ( ( ) => expect ( count ) . toBe ( 1 ) )
229
+ await vi . advanceTimersByTimeAsync ( 10 )
230
+ expect ( count ) . toBe ( 1 )
225
231
226
232
unsubscribe ( )
227
233
} )
@@ -251,7 +257,8 @@ describe('queryObserver', () => {
251
257
data : undefined ,
252
258
} )
253
259
254
- await vi . waitFor ( ( ) => expect ( count ) . toBe ( 1 ) )
260
+ await vi . advanceTimersByTimeAsync ( 10 )
261
+ expect ( count ) . toBe ( 1 )
255
262
256
263
// re-subscribe after data comes in
257
264
unsubscribe = observer . subscribe ( vi . fn ( ) )
@@ -1172,8 +1179,10 @@ describe('queryObserver', () => {
1172
1179
}
1173
1180
} )
1174
1181
1175
- await vi . waitFor ( ( ) => expect ( results [ 0 ] ?. isStale ) . toBe ( false ) )
1176
- await vi . waitFor ( ( ) => expect ( results [ 1 ] ?. isStale ) . toBe ( true ) )
1182
+ await vi . advanceTimersByTimeAsync ( 25 )
1183
+ expect ( results [ 0 ] ?. isStale ) . toBe ( false )
1184
+ await vi . advanceTimersByTimeAsync ( 1 )
1185
+ expect ( results [ 1 ] ?. isStale ) . toBe ( true )
1177
1186
1178
1187
unsubscribe ( )
1179
1188
} )
@@ -1200,7 +1209,8 @@ describe('queryObserver', () => {
1200
1209
}
1201
1210
} )
1202
1211
1203
- await vi . waitFor ( ( ) => expect ( results [ 0 ] ?. isStale ) . toBe ( false ) )
1212
+ await vi . advanceTimersByTimeAsync ( 5 )
1213
+ expect ( results [ 0 ] ?. isStale ) . toBe ( false )
1204
1214
1205
1215
unsubscribe ( )
1206
1216
} )
@@ -1224,9 +1234,8 @@ describe('queryObserver', () => {
1224
1234
results . push ( observer . getCurrentResult ( ) )
1225
1235
} )
1226
1236
1227
- await vi . waitFor ( ( ) => {
1228
- expect ( results . at ( - 1 ) ?. data ) . toBe ( 'data' )
1229
- } )
1237
+ await vi . advanceTimersByTimeAsync ( 10 )
1238
+ expect ( results . at ( - 1 ) ?. data ) . toBe ( 'data' )
1230
1239
1231
1240
const numberOfUniquePromises = new Set (
1232
1241
results . map ( ( result ) => result . promise ) ,
@@ -1257,9 +1266,8 @@ describe('queryObserver', () => {
1257
1266
results . push ( observer . getCurrentResult ( ) )
1258
1267
} )
1259
1268
1260
- await vi . waitFor ( ( ) => {
1261
- expect ( results . at ( - 1 ) ?. status ) . toBe ( 'error' )
1262
- } )
1269
+ await vi . advanceTimersByTimeAsync ( 5 )
1270
+ expect ( results . at ( - 1 ) ?. status ) . toBe ( 'error' )
1263
1271
1264
1272
expect (
1265
1273
results . every ( ( result ) => result . promise === results [ 0 ] ! . promise ) ,
@@ -1269,10 +1277,9 @@ describe('queryObserver', () => {
1269
1277
// fail again
1270
1278
const lengthBefore = results . length
1271
1279
observer . refetch ( )
1272
- await vi . waitFor ( ( ) => {
1273
- expect ( results . length ) . toBeGreaterThan ( lengthBefore )
1274
- expect ( results . at ( - 1 ) ?. status ) . toBe ( 'error' )
1275
- } )
1280
+ await vi . advanceTimersByTimeAsync ( 5 )
1281
+ expect ( results . length ) . toBeGreaterThan ( lengthBefore )
1282
+ expect ( results . at ( - 1 ) ?. status ) . toBe ( 'error' )
1276
1283
1277
1284
const numberOfUniquePromises = new Set (
1278
1285
results . map ( ( result ) => result . promise ) ,
@@ -1285,9 +1292,8 @@ describe('queryObserver', () => {
1285
1292
succeeds = true
1286
1293
observer . refetch ( )
1287
1294
1288
- await vi . waitFor ( ( ) => {
1289
- results . at ( - 1 ) ?. status === 'success'
1290
- } )
1295
+ await vi . advanceTimersByTimeAsync ( 5 )
1296
+ results . at ( - 1 ) ?. status === 'success'
1291
1297
1292
1298
const numberOfUniquePromises = new Set (
1293
1299
results . map ( ( result ) => result . promise ) ,
@@ -1359,10 +1365,9 @@ describe('queryObserver', () => {
1359
1365
results . push ( result )
1360
1366
} )
1361
1367
1362
- await vi . waitFor ( ( ) => {
1363
- const lastResult = results [ results . length - 1 ]
1364
- expect ( lastResult ?. status ) . toBe ( 'error' )
1365
- } )
1368
+ await vi . advanceTimersByTimeAsync ( 0 )
1369
+ const lastResult = results [ results . length - 1 ]
1370
+ expect ( lastResult ?. status ) . toBe ( 'error' )
1366
1371
1367
1372
expect ( results . length ) . toBe ( 1 )
1368
1373
expect ( results [ 0 ] ) . toMatchObject ( {
0 commit comments