From 066d200da23619797b65741db25c17e8c4940714 Mon Sep 17 00:00:00 2001
From: Wonsuk Choi <sukvvon@gmail.com>
Date: Thu, 4 Jun 2026 10:59:41 +0900
Subject: [PATCH] test(query-persist-client-core/persist): hoist 'queryClient'
 and 'persister' setup into 'beforeEach' and clear in 'afterEach'

---
 .../src/__tests__/persist.test.ts             | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/packages/query-persist-client-core/src/__tests__/persist.test.ts b/packages/query-persist-client-core/src/__tests__/persist.test.ts
index 779d887f522..4a7f5528491 100644
--- a/packages/query-persist-client-core/src/__tests__/persist.test.ts
+++ b/packages/query-persist-client-core/src/__tests__/persist.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { QueriesObserver, QueryClient, dehydrate } from '@tanstack/query-core'
 import {
   persistQueryClientRestore,
@@ -64,6 +64,18 @@ describe('persistQueryClientSave', () => {
 })
 
 describe('persistQueryClientRestore', () => {
+  let queryClient: QueryClient
+  let persister: ReturnType<typeof createSpyPersister>
+
+  beforeEach(() => {
+    queryClient = new QueryClient()
+    persister = createSpyPersister()
+  })
+
+  afterEach(() => {
+    queryClient.clear()
+  })
+
   it('should rethrow exceptions in `restoreClient`', async () => {
     const consoleMock = vi
       .spyOn(console, 'error')
@@ -73,12 +85,8 @@ describe('persistQueryClientRestore', () => {
       .spyOn(console, 'warn')
       .mockImplementation(() => undefined)
 
-    const queryClient = new QueryClient()
-
     const restoreError = new Error('Error restoring client')
 
-    const persister = createSpyPersister()
-
     persister.restoreClient = () => Promise.reject(restoreError)
 
     await expect(
@@ -105,13 +113,9 @@ describe('persistQueryClientRestore', () => {
       .spyOn(console, 'warn')
       .mockImplementation(() => undefined)
 
-    const queryClient = new QueryClient()
-
     const restoreError = new Error('Error restoring client')
     const removeError = new Error('Error removing client')
 
-    const persister = createSpyPersister()
-
     persister.restoreClient = () => Promise.reject(restoreError)
     persister.removeClient = () => Promise.reject(removeError)
 
@@ -131,9 +135,6 @@ describe('persistQueryClientRestore', () => {
   })
 
   it('should rethrow error in `removeClient`', async () => {
-    const queryClient = new QueryClient()
-
-    const persister = createSpyPersister()
     const removeError = new Error('Error removing client')
 
     persister.removeClient = () => Promise.reject(removeError)
@@ -160,9 +161,6 @@ describe('persistQueryClientRestore', () => {
     const sourceClient = new QueryClient()
     sourceClient.setQueryData(['key'], 'data')
 
-    const queryClient = new QueryClient()
-    const persister = createSpyPersister()
-
     persister.restoreClient = () =>
       Promise.resolve({
         buster: '',