@@ -501,15 +501,14 @@ describe('query', () => {
501
501
} )
502
502
const unsubscribe1 = observer . subscribe ( ( ) => undefined )
503
503
unsubscribe1 ( )
504
- await vi . waitFor ( ( ) =>
505
- expect ( queryCache . find ( { queryKey : key } ) ) . toBeUndefined ( ) ,
506
- )
504
+
505
+ await vi . advanceTimersByTimeAsync ( 0 )
506
+ expect ( queryCache . find ( { queryKey : key } ) ) . toBeUndefined ( )
507
507
const unsubscribe2 = observer . subscribe ( ( ) => undefined )
508
508
unsubscribe2 ( )
509
509
510
- await vi . waitFor ( ( ) =>
511
- expect ( queryCache . find ( { queryKey : key } ) ) . toBeUndefined ( ) ,
512
- )
510
+ await vi . advanceTimersByTimeAsync ( 0 )
511
+ expect ( queryCache . find ( { queryKey : key } ) ) . toBeUndefined ( )
513
512
expect ( count ) . toBe ( 1 )
514
513
} )
515
514
@@ -524,9 +523,9 @@ describe('query', () => {
524
523
const unsubscribe = observer . subscribe ( ( ) => undefined )
525
524
expect ( queryCache . find ( { queryKey : key } ) ) . toBeDefined ( )
526
525
unsubscribe ( )
527
- await vi . waitFor ( ( ) =>
528
- expect ( queryCache . find ( { queryKey : key } ) ) . toBeUndefined ( ) ,
529
- )
526
+
527
+ await vi . advanceTimersByTimeAsync ( 0 )
528
+ expect ( queryCache . find ( { queryKey : key } ) ) . toBeUndefined ( )
530
529
} )
531
530
532
531
test ( 'should be garbage collected later when unsubscribed and query is fetching' , async ( ) => {
@@ -544,9 +543,8 @@ describe('query', () => {
544
543
// unsubscribe should not remove even though gcTime has elapsed b/c query is still fetching
545
544
expect ( queryCache . find ( { queryKey : key } ) ) . toBeDefined ( )
546
545
// should be removed after an additional staleTime wait
547
- await vi . waitFor ( ( ) =>
548
- expect ( queryCache . find ( { queryKey : key } ) ) . toBeUndefined ( ) ,
549
- )
546
+ await vi . advanceTimersByTimeAsync ( 30 )
547
+ expect ( queryCache . find ( { queryKey : key } ) ) . toBeUndefined ( )
550
548
} )
551
549
552
550
test ( 'should not be garbage collected unless there are no subscribers' , async ( ) => {
@@ -887,12 +885,11 @@ describe('query', () => {
887
885
888
886
queryClient . setQueryData ( key , 'data' )
889
887
890
- await vi . waitFor ( ( ) =>
891
- expect ( fn ) . toHaveBeenCalledWith (
892
- expect . objectContaining ( {
893
- type : 'removed' ,
894
- } ) ,
895
- ) ,
888
+ await vi . advanceTimersByTimeAsync ( 10 )
889
+ expect ( fn ) . toHaveBeenCalledWith (
890
+ expect . objectContaining ( {
891
+ type : 'removed' ,
892
+ } ) ,
896
893
)
897
894
898
895
expect ( queryClient . getQueryCache ( ) . findAll ( ) ) . toHaveLength ( 0 )
0 commit comments