Skip to content

Commit 1881109

Browse files
test(svelte-query): extract 'queryClient' creation from Svelte components to test files (#10447)
* test(svelte-query): extract 'queryClient' creation from Svelte components to test files * ci: apply automated fixes * test(svelte-query/createMutation): rename 'client1'/'client2' to 'queryClient1'/'queryClient2' for clarity --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
1 parent 300d81e commit 1881109

24 files changed

Lines changed: 131 additions & 55 deletions

packages/svelte-query/tests/HydrationBoundary/BaseExample.svelte

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts">
2-
import { QueryClient } from '@tanstack/query-core'
2+
import type { QueryClient } from '@tanstack/query-core'
33
import {
44
HydrationBoundary,
55
createQuery,
@@ -8,14 +8,15 @@
88
import type { DehydratedState } from '@tanstack/query-core'
99
1010
let {
11+
queryClient,
1112
dehydratedState,
1213
queryFn,
1314
}: {
15+
queryClient: QueryClient
1416
dehydratedState: DehydratedState
1517
queryFn: () => Promise<string>
1618
} = $props()
1719
18-
const queryClient = new QueryClient()
1920
setQueryClientContext(queryClient)
2021
2122
const query = createQuery(() => ({

packages/svelte-query/tests/HydrationBoundary/HydrationBoundary.svelte.test.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,25 @@ import { sleep } from '@tanstack/query-test-utils'
55
import BaseExample from './BaseExample.svelte'
66

77
describe('HydrationBoundary', () => {
8+
let queryClient: QueryClient
89
let stringifiedState: string
910

1011
beforeEach(async () => {
1112
vi.useFakeTimers()
12-
const queryClient = new QueryClient()
13-
queryClient.prefetchQuery({
13+
queryClient = new QueryClient()
14+
const dehydrateClient = new QueryClient()
15+
dehydrateClient.prefetchQuery({
1416
queryKey: ['string'],
1517
queryFn: () => sleep(10).then(() => 'stringCached'),
1618
})
1719
await vi.advanceTimersByTimeAsync(10)
18-
const dehydrated = dehydrate(queryClient)
20+
const dehydrated = dehydrate(dehydrateClient)
1921
stringifiedState = JSON.stringify(dehydrated)
20-
queryClient.clear()
22+
dehydrateClient.clear()
2123
})
2224

2325
afterEach(() => {
26+
queryClient.clear()
2427
vi.useRealTimers()
2528
})
2629

@@ -29,6 +32,7 @@ describe('HydrationBoundary', () => {
2932

3033
const rendered = render(BaseExample, {
3134
props: {
35+
queryClient,
3236
dehydratedState,
3337
queryFn: () => sleep(20).then(() => 'string'),
3438
},

packages/svelte-query/tests/QueryClientProvider/QueryClientProvider.svelte.test.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@ import { QueryClient } from '@tanstack/query-core'
44
import BaseExample from './BaseExample.svelte'
55

66
describe('QueryClientProvider', () => {
7+
let queryClient: QueryClient
8+
79
beforeEach(() => {
810
vi.useFakeTimers()
11+
queryClient = new QueryClient()
912
})
1013

1114
afterEach(() => {
15+
queryClient.clear()
1216
vi.useRealTimers()
1317
})
1418

1519
test('Sets a specific cache for all queries to use', async () => {
16-
const queryClient = new QueryClient()
1720
const queryCache = queryClient.getQueryCache()
1821

1922
const rendered = render(BaseExample, {
2023
props: {
21-
queryClient: queryClient,
24+
queryClient,
2225
},
2326
})
2427

packages/svelte-query/tests/createInfiniteQuery/BaseExample.svelte

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<script lang="ts">
22
import { untrack } from 'svelte'
3-
import { QueryClient } from '@tanstack/query-core'
43
import { queryKey, sleep } from '@tanstack/query-test-utils'
54
import { createInfiniteQuery } from '../../src/index.js'
65
import { setQueryClientContext } from '../../src/context.js'
7-
import type { QueryObserverResult } from '@tanstack/query-core'
6+
import type { QueryClient, QueryObserverResult } from '@tanstack/query-core'
87
9-
let { states }: { states: { value: Array<QueryObserverResult> } } = $props()
8+
let {
9+
queryClient,
10+
states,
11+
}: {
12+
queryClient: QueryClient
13+
states: { value: Array<QueryObserverResult> }
14+
} = $props()
1015
11-
const queryClient = new QueryClient()
1216
setQueryClientContext(queryClient)
1317
1418
const query = createInfiniteQuery(() => ({

packages/svelte-query/tests/createInfiniteQuery/SelectExample.svelte

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<script lang="ts">
22
import { untrack } from 'svelte'
3-
import { QueryClient } from '@tanstack/query-core'
43
import { createInfiniteQuery } from '../../src/index.js'
54
import { setQueryClientContext } from '../../src/context.js'
6-
import type { QueryObserverResult } from '@tanstack/query-core'
5+
import type { QueryClient, QueryObserverResult } from '@tanstack/query-core'
76
import { queryKey, sleep } from '@tanstack/query-test-utils'
87
9-
let { states }: { states: { value: Array<QueryObserverResult> } } = $props()
8+
let {
9+
queryClient,
10+
states,
11+
}: {
12+
queryClient: QueryClient
13+
states: { value: Array<QueryObserverResult> }
14+
} = $props()
1015
11-
const queryClient = new QueryClient()
1216
setQueryClientContext(queryClient)
1317
1418
const query = createInfiniteQuery(() => ({

packages/svelte-query/tests/createInfiniteQuery/createInfiniteQuery.svelte.test.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ import ChangeClientExample from './ChangeClientExample.svelte'
88
import type { QueryObserverResult } from '@tanstack/query-core'
99

1010
describe('createInfiniteQuery', () => {
11+
let queryClient: QueryClient
12+
1113
beforeEach(() => {
1214
vi.useFakeTimers()
15+
queryClient = new QueryClient()
1316
})
1417

1518
afterEach(() => {
19+
queryClient.clear()
1620
vi.useRealTimers()
1721
})
1822

@@ -21,6 +25,7 @@ describe('createInfiniteQuery', () => {
2125

2226
const rendered = render(BaseExample, {
2327
props: {
28+
queryClient,
2429
states,
2530
},
2631
})
@@ -110,6 +115,7 @@ describe('createInfiniteQuery', () => {
110115

111116
const rendered = render(SelectExample, {
112117
props: {
118+
queryClient,
113119
states,
114120
},
115121
})
@@ -131,8 +137,6 @@ describe('createInfiniteQuery', () => {
131137
})
132138

133139
it('should be able to set new pages with the query client', async () => {
134-
const queryClient = new QueryClient()
135-
136140
const rendered = render(ChangeClientExample, {
137141
props: {
138142
queryClient,

packages/svelte-query/tests/createMutation/FailureExample.svelte

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<script lang="ts">
2-
import { QueryClient } from '@tanstack/query-core'
2+
import type { QueryClient } from '@tanstack/query-core'
33
import { createMutation, setQueryClientContext } from '../../src/index.js'
44
55
let {
6+
queryClient,
67
mutationFn,
7-
}: { mutationFn: (value: { count: number }) => Promise<{ count: number }> } =
8-
$props()
8+
}: {
9+
queryClient: QueryClient
10+
mutationFn: (value: { count: number }) => Promise<{ count: number }>
11+
} = $props()
912
1013
let count = $state(0)
1114
12-
const queryClient = new QueryClient()
1315
setQueryClientContext(queryClient)
1416
1517
const mutation = createMutation(() => ({ mutationFn }))

packages/svelte-query/tests/createMutation/OnSuccessExample.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<script lang="ts">
2-
import { QueryClient } from '@tanstack/query-core'
2+
import type { QueryClient } from '@tanstack/query-core'
33
import { createMutation, setQueryClientContext } from '../../src/index.js'
44
import { sleep } from '@tanstack/query-test-utils'
55
66
type Props = {
7+
queryClient: QueryClient
78
onSuccessMock: any
89
onSettledMock: any
910
}
1011
11-
const { onSettledMock, onSuccessMock }: Props = $props()
12+
const { queryClient, onSettledMock, onSuccessMock }: Props = $props()
1213
1314
let count = $state(0)
1415
15-
const queryClient = new QueryClient()
1616
setQueryClientContext(queryClient)
1717
1818
const mutation = createMutation(() => ({

packages/svelte-query/tests/createMutation/ResetExample.svelte

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<script lang="ts">
2-
import { QueryClient } from '@tanstack/query-core'
2+
import type { QueryClient } from '@tanstack/query-core'
33
import { createMutation, setQueryClientContext } from '../../src/index.js'
44
import { sleep } from '@tanstack/query-test-utils'
55
6-
const queryClient = new QueryClient()
6+
let { queryClient }: { queryClient: QueryClient } = $props()
7+
78
setQueryClientContext(queryClient)
89
910
const mutation = createMutation(() => ({

packages/svelte-query/tests/createMutation/createMutation.svelte.test.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,22 @@ import OnSuccessExample from './OnSuccessExample.svelte'
1010
import FailureExample from './FailureExample.svelte'
1111

1212
describe('createMutation', () => {
13+
let queryClient: QueryClient
14+
1315
beforeEach(() => {
1416
vi.useFakeTimers()
17+
queryClient = new QueryClient()
1518
})
1619

1720
afterEach(() => {
21+
queryClient.clear()
1822
vi.useRealTimers()
1923
})
2024

2125
test('Able to reset `error`', async () => {
22-
const rendered = render(ResetExample)
26+
const rendered = render(ResetExample, {
27+
props: { queryClient },
28+
})
2329

2430
expect(rendered.queryByText('Error: undefined')).toBeInTheDocument()
2531

@@ -38,6 +44,7 @@ describe('createMutation', () => {
3844

3945
const rendered = render(OnSuccessExample, {
4046
props: {
47+
queryClient,
4148
onSuccessMock,
4249
onSettledMock,
4350
},
@@ -75,6 +82,7 @@ describe('createMutation', () => {
7582

7683
const rendered = render(FailureExample, {
7784
props: {
85+
queryClient,
7886
mutationFn,
7987
},
8088
})
@@ -106,13 +114,13 @@ describe('createMutation', () => {
106114
const queryClient1 = new QueryClient()
107115
const queryClient2 = new QueryClient()
108116

109-
let queryClient = $state(queryClient1)
117+
let activeClient = $state(queryClient1)
110118

111119
const mutation = createMutation(
112120
() => ({
113121
mutationFn: (params: string) => sleep(10).then(() => params),
114122
}),
115-
() => queryClient,
123+
() => activeClient,
116124
)
117125

118126
mutation.mutate('first')
@@ -121,7 +129,7 @@ describe('createMutation', () => {
121129
expect(mutation.status).toBe('success')
122130
expect(mutation.data).toBe('first')
123131

124-
queryClient = queryClient2
132+
activeClient = queryClient2
125133
flushSync()
126134

127135
expect(mutation.status).toBe('idle')

0 commit comments

Comments
 (0)