From e46a4afd86e24e3985eaee8e8dd2c4193aead370 Mon Sep 17 00:00:00 2001
From: arnaudbzn <arnaud.bezancon@advantys.com>
Date: Sat, 23 Oct 2021 09:16:19 +0200
Subject: [PATCH 1/2] fix(useBaseQuery): set cacheTime to 1 with Suspense

---
 docs/src/pages/guides/testing.md  |  4 +++
 src/react/tests/suspense.test.tsx | 45 +++++++++++++++++++++++++++++++
 src/react/useBaseQuery.ts         |  8 ++++++
 3 files changed, 57 insertions(+)

diff --git a/docs/src/pages/guides/testing.md b/docs/src/pages/guides/testing.md
index f348358462..892fadf5b4 100644
--- a/docs/src/pages/guides/testing.md
+++ b/docs/src/pages/guides/testing.md
@@ -85,6 +85,10 @@ setLogger({
 })
 ```
 
+## Set cacheTime to Infinity with Jest
+
+`cacheTime` is set to 5 minutes by default. It means that the cache garbage collector timer will be triggered every 5 minutes. If you use Jest, you can set the `cacheTime` to `Infinity` to prevent "Jest did not exit one second after the test run completed" error message.
+
 ## Testing Network Calls
 
 The primary use for React Query is to cache network requests, so it's important that we can test our code is making the correct network requests in the first place.
diff --git a/src/react/tests/suspense.test.tsx b/src/react/tests/suspense.test.tsx
index 1dd4704110..50a63e22d4 100644
--- a/src/react/tests/suspense.test.tsx
+++ b/src/react/tests/suspense.test.tsx
@@ -890,4 +890,49 @@ describe("useQuery's in Suspense mode", () => {
     await waitFor(() => rendered.getByText('error boundary'))
     consoleMock.mockRestore()
   })
+
+  it('should render the correct amount of times in Suspense mode when cacheTime is set to 0', async () => {
+    const key = queryKey()
+    let state: UseQueryResult<number> | null = null
+
+    let count = 0
+    let renders = 0
+
+    function Page() {
+      renders++
+
+      state = useQuery(
+        key,
+        async () => {
+          count++
+          await sleep(10)
+          return count
+        },
+        { suspense: true, cacheTime: 0 }
+      )
+
+      return (
+        <div>
+          <span>rendered</span>
+        </div>
+      )
+    }
+
+    const rendered = renderWithClient(
+      queryClient,
+      <React.Suspense fallback="loading">
+        <Page />
+      </React.Suspense>
+    )
+
+    await waitFor(() =>
+      expect(state).toMatchObject({
+        data: 1,
+        status: 'success',
+      })
+    )
+
+    expect(renders).toBe(2)
+    expect(rendered.queryByText('rendered')).not.toBeNull()
+  })
 })
diff --git a/src/react/useBaseQuery.ts b/src/react/useBaseQuery.ts
index 6db43cb2a4..11a4fe6d42 100644
--- a/src/react/useBaseQuery.ts
+++ b/src/react/useBaseQuery.ts
@@ -61,6 +61,14 @@ export function useBaseQuery<
     }
   }
 
+  if (defaultedOptions.suspense) {
+    // Set cache time to 1 if the option has been set to 0
+    // when using suspense to prevent infinite loop of fetches
+    if (defaultedOptions.cacheTime === 0) {
+      defaultedOptions.cacheTime = 1
+    }
+  }
+
   if (defaultedOptions.suspense || defaultedOptions.useErrorBoundary) {
     // Prevent retrying failed query if the error boundary has not been reset yet
     if (!errorResetBoundary.isReset()) {

From 6d77df2c26cb30c12254683aa38780197a969743 Mon Sep 17 00:00:00 2001
From: arnaudbzn <arnaud.bezancon@advantys.com>
Date: Sat, 23 Oct 2021 10:25:56 +0200
Subject: [PATCH 2/2] refactor: group both suspense related block of coce

---
 src/react/useBaseQuery.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/react/useBaseQuery.ts b/src/react/useBaseQuery.ts
index 11a4fe6d42..0736532baa 100644
--- a/src/react/useBaseQuery.ts
+++ b/src/react/useBaseQuery.ts
@@ -59,9 +59,7 @@ export function useBaseQuery<
     if (typeof defaultedOptions.staleTime !== 'number') {
       defaultedOptions.staleTime = 1000
     }
-  }
 
-  if (defaultedOptions.suspense) {
     // Set cache time to 1 if the option has been set to 0
     // when using suspense to prevent infinite loop of fetches
     if (defaultedOptions.cacheTime === 0) {