Merge branch 'main' into test/query-core-onlineManager-replace-advanceTimersByTimeAsync-with-advanceTimersByTime

Author: manudeli

packages/query-core/src/__tests__/infiniteQueryBehavior.test.tsx

@@ -37,12 +37,11 @@ describe('InfiniteQueryBehavior', () => {
       observerResult = result
     })
 
-    await vi.waitFor(() => {
-      const query = queryCache.find({ queryKey: key })!
-      return expect(observerResult).toMatchObject({
-        isError: true,
-        error: new Error(`Missing queryFn: '${query.queryHash}'`),
-      })
+    await vi.advanceTimersByTimeAsync(0)
+    const query = queryCache.find({ queryKey: key })!
+    expect(observerResult).toMatchObject({
+      isError: true,
+      error: new Error(`Missing queryFn: '${query.queryHash}'`),
     })
 
     unsubscribe()
@@ -75,12 +74,11 @@ describe('InfiniteQueryBehavior', () => {
     })
 
     // Wait for the first page to be fetched
-    await vi.waitFor(() =>
-      expect(observerResult).toMatchObject({
-        isFetching: false,
-        data: { pages: [1], pageParams: [1] },
-      }),
-    )
+    await vi.advanceTimersByTimeAsync(0)
+    expect(observerResult).toMatchObject({
+      isFetching: false,
+      data: { pages: [1], pageParams: [1] },
+    })
 
     expect(queryFnSpy).toHaveBeenNthCalledWith(1, {
       queryKey: key,
@@ -227,14 +225,13 @@ describe('InfiniteQueryBehavior', () => {
     query.cancel()
 
     // Wait for the first page to be cancelled
-    await vi.waitFor(() =>
-      expect(observerResult).toMatchObject({
-        isFetching: false,
-        isError: true,
-        error: new CancelledError(),
-        data: undefined,
-      }),
-    )
+    await vi.advanceTimersByTimeAsync(0)
+    expect(observerResult).toMatchObject({
+      isFetching: false,
+      isError: true,
+      error: new CancelledError(),
+      data: undefined,
+    })
 
     expect(queryFnSpy).toHaveBeenCalledTimes(1)
 
@@ -276,12 +273,11 @@ describe('InfiniteQueryBehavior', () => {
     })
 
     // Wait for the first page to be fetched
-    await vi.waitFor(() =>
-      expect(observerResult).toMatchObject({
-        isFetching: false,
-        data: { pages: [1], pageParams: [1] },
-      }),
-    )
+    await vi.advanceTimersByTimeAsync(0)
+    expect(observerResult).toMatchObject({
+      isFetching: false,
+      data: { pages: [1], pageParams: [1] },
+    })
 
     queryFnSpy.mockClear()
 
@@ -426,12 +422,11 @@ describe('InfiniteQueryBehavior', () => {
       observerResult = result
     })
 
-    await vi.waitFor(() =>
-      expect(observerResult).toMatchObject({
-        isFetching: false,
-        data: { pages: ['data'], pageParams: [null] },
-      }),
-    )
+    await vi.advanceTimersByTimeAsync(0)
+    expect(observerResult).toMatchObject({
+      isFetching: false,
+      data: { pages: ['data'], pageParams: [null] },
+    })
 
     unsubscribe()
   })
@@ -454,12 +449,11 @@ describe('InfiniteQueryBehavior', () => {
       observerResult = result
     })
 
-    await vi.waitFor(() =>
-      expect(observerResult).toMatchObject({
-        isFetching: false,
-        data: { pages: [1], pageParams: [1] },
-      }),
-    )
+    await vi.advanceTimersByTimeAsync(0)
+    expect(observerResult).toMatchObject({
+      isFetching: false,
+      data: { pages: [1], pageParams: [1] },
+    })
 
     await observer.fetchNextPage()
 
@@ -488,9 +482,8 @@ describe('InfiniteQueryBehavior', () => {
 
     const unsubscribe = observer.subscribe(() => {})
 
-    await vi.waitFor(() => {
-      expect(persisterSpy).toHaveBeenCalledTimes(1)
-    })
+    await vi.advanceTimersByTimeAsync(0)
+    expect(persisterSpy).toHaveBeenCalledTimes(1)
 
     unsubscribe()
   })

packages/query-core/src/__tests__/infiniteQueryObserver.test.tsx

@@ -20,7 +20,7 @@ describe('InfiniteQueryObserver', () => {
     vi.useRealTimers()
   })
 
-  test('InfiniteQueryObserver should be able to fetch an infinite query with selector', async () => {
+  test('should be able to fetch an infinite query with selector', async () => {
     const key = queryKey()
     const observer = new InfiniteQueryObserver(queryClient, {
       queryKey: key,
@@ -43,7 +43,7 @@ describe('InfiniteQueryObserver', () => {
     })
   })
 
-  test('InfiniteQueryObserver should pass the meta option to the queryFn', async () => {
+  test('should pass the meta option to the queryFn', async () => {
     const meta = {
       it: 'works',
     }
@@ -73,7 +73,7 @@ describe('InfiniteQueryObserver', () => {
     expect(queryFn).toBeCalledWith(expect.objectContaining({ meta }))
   })
 
-  test('getNextPagParam and getPreviousPageParam should receive current pageParams', async () => {
+  test('should make getNextPageParam and getPreviousPageParam receive current pageParams', async () => {
     const key = queryKey()
     let single: Array<string> = []
     let all: Array<string> = []
@@ -207,7 +207,7 @@ describe('InfiniteQueryObserver', () => {
     expect(observer.getCurrentResult().hasNextPage).toBe(false)
   })
 
-  test('getOptimisticResult should set infinite query behavior and return initial state', () => {
+  test('should set infinite query behavior via getOptimisticResult and return the initial state', () => {
     const key = queryKey()
     const observer = new InfiniteQueryObserver(queryClient, {
       queryKey: key,

packages/query-core/src/__tests__/mutationCache.test.tsx

@@ -310,9 +310,8 @@ describe('mutationCache', () => {
         1,
       )
       expect(testCache.getAll()).toHaveLength(1)
-      await vi.waitFor(() => {
-        expect(testCache.getAll()).toHaveLength(0)
-      })
+      await vi.advanceTimersByTimeAsync(10)
+      expect(testCache.getAll()).toHaveLength(0)
       expect(onSuccess).toHaveBeenCalledTimes(1)
     })
 
@@ -376,9 +375,8 @@ describe('mutationCache', () => {
       const unsubscribe = observer.subscribe(() => undefined)
       observer.mutate(1)
       unsubscribe()
-      await vi.waitFor(() => {
-        expect(queryClient.getMutationCache().getAll()).toHaveLength(0)
-      })
+      await vi.advanceTimersByTimeAsync(0)
+      expect(queryClient.getMutationCache().getAll()).toHaveLength(0)
       expect(onSuccess).toHaveBeenCalledTimes(1)
     })
   })

packages/query-core/src/__tests__/mutations.test.tsx

@@ -397,8 +397,8 @@ describe('mutations', () => {
     const onSuccess = vi.fn()
 
     const mutation = new MutationObserver(queryClient, {
-      mutationFn: () => {
-        sleep(100)
+      mutationFn: async () => {
+        await sleep(100)
         return Promise.resolve('update')
       },
       onSuccess: () => {
@@ -409,16 +409,17 @@ describe('mutations', () => {
     void mutation.mutate()
 
     mutation.setOptions({
-      mutationFn: () => {
-        sleep(100)
+      mutationFn: async () => {
+        await sleep(100)
         return Promise.resolve('update')
       },
       onSuccess: () => {
         onSuccess(2)
       },
     })
 
-    await vi.waitFor(() => expect(onSuccess).toHaveBeenCalledTimes(1))
+    await vi.advanceTimersByTimeAsync(100)
+    expect(onSuccess).toHaveBeenCalledTimes(1)
 
     expect(onSuccess).toHaveBeenCalledWith(2)
   })

packages/query-core/src/__tests__/queriesObserver.test.tsx

@@ -254,13 +254,11 @@ describe('queriesObserver', () => {
     const unsubscribe2 = observer.subscribe(subscription2Handler)
 
     unsubscribe1()
-
-    await vi.waitFor(() => {
-      // 1 call: pending
-      expect(subscription1Handler).toBeCalledTimes(1)
-      // 1 call: success
-      expect(subscription2Handler).toBeCalledTimes(1)
-    })
+    await vi.advanceTimersByTimeAsync(20)
+    // 1 call: pending
+    expect(subscription1Handler).toBeCalledTimes(1)
+    // 1 call: success
+    expect(subscription2Handler).toBeCalledTimes(1)
 
     // Clean-up
     unsubscribe2()

packages/query-core/src/__tests__/queryCache.test.tsx

@@ -58,7 +58,8 @@ describe('queryCache', () => {
 
       const unsubScribeObserver = observer.subscribe(vi.fn())
 
-      await vi.waitFor(() => expect(events.length).toBe(8))
+      await vi.advanceTimersByTimeAsync(11)
+      expect(events.length).toBe(8)
 
       expect(events).toEqual([
         'added', // 1. Query added -> loading