Skip to content

Commit 300d81e

Browse files
test(svelte-query): unify queryClient passing to 'setQueryClientContext' and rename test components (#10446)
* test(svelte-query): unify queryClient passing to 'setQueryClientContext' and rename test components * ci: apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
1 parent d36ece2 commit 300d81e

16 files changed

Lines changed: 90 additions & 123 deletions

packages/svelte-query/tests/ProviderWrapper.svelte

Lines changed: 0 additions & 14 deletions
This file was deleted.

packages/svelte-query/tests/QueryClientProvider/ParentComponent.svelte renamed to packages/svelte-query/tests/QueryClientProvider/BaseExample.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<script lang="ts">
22
import { QueryClientProvider } from '../../src/index.js'
3-
import ChildComponent from './ChildComponent.svelte'
3+
import QueryChild from './QueryChild.svelte'
44
import type { QueryClient } from '@tanstack/query-core'
55
66
let { queryClient }: { queryClient: QueryClient } = $props()
77
</script>
88

99
<QueryClientProvider client={queryClient}>
10-
<ChildComponent />
10+
<QueryChild />
1111
</QueryClientProvider>

packages/svelte-query/tests/QueryClientProvider/ChildComponent.svelte renamed to packages/svelte-query/tests/QueryClientProvider/QueryChild.svelte

File renamed without changes.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
22
import { render } from '@testing-library/svelte'
33
import { QueryClient } from '@tanstack/query-core'
4-
import ParentComponent from './ParentComponent.svelte'
4+
import BaseExample from './BaseExample.svelte'
55

66
describe('QueryClientProvider', () => {
77
beforeEach(() => {
@@ -16,7 +16,7 @@ describe('QueryClientProvider', () => {
1616
const queryClient = new QueryClient()
1717
const queryCache = queryClient.getQueryCache()
1818

19-
const rendered = render(ParentComponent, {
19+
const rendered = render(BaseExample, {
2020
props: {
2121
queryClient: queryClient,
2222
},

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@
33
import { QueryClient } from '@tanstack/query-core'
44
import { queryKey, sleep } from '@tanstack/query-test-utils'
55
import { createInfiniteQuery } from '../../src/index.js'
6+
import { setQueryClientContext } from '../../src/context.js'
67
import type { QueryObserverResult } from '@tanstack/query-core'
78
89
let { states }: { states: { value: Array<QueryObserverResult> } } = $props()
910
1011
const queryClient = new QueryClient()
12+
setQueryClientContext(queryClient)
1113
12-
const query = createInfiniteQuery(
13-
() => ({
14-
queryKey: queryKey(),
15-
queryFn: ({ pageParam }) => sleep(10).then(() => pageParam),
16-
getNextPageParam: (lastPage) => lastPage + 1,
17-
initialPageParam: 0,
18-
}),
19-
() => queryClient,
20-
)
14+
const query = createInfiniteQuery(() => ({
15+
queryKey: queryKey(),
16+
queryFn: ({ pageParam }) => sleep(10).then(() => pageParam),
17+
getNextPageParam: (lastPage) => lastPage + 1,
18+
initialPageParam: 0,
19+
}))
2120
2221
$effect(() => {
2322
// @ts-expect-error

packages/svelte-query/tests/createInfiniteQuery/ChangeClient.svelte renamed to packages/svelte-query/tests/createInfiniteQuery/ChangeClientExample.svelte

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script lang="ts">
22
import { QueryClient } from '@tanstack/query-core'
33
import { createInfiniteQuery } from '../../src/index.js'
4+
import { setQueryClientContext } from '../../src/context.js'
45
import { sleep } from '@tanstack/query-test-utils'
56
67
let { queryClient }: { queryClient: QueryClient } = $props()
@@ -9,15 +10,14 @@
910
1011
let firstPage = $state(0)
1112
12-
const query = createInfiniteQuery(
13-
() => ({
14-
queryKey: queryKey,
15-
queryFn: ({ pageParam }) => sleep(10).then(() => pageParam),
16-
getNextPageParam: (lastPage) => lastPage + 1,
17-
initialPageParam: firstPage,
18-
}),
19-
() => queryClient,
20-
)
13+
setQueryClientContext(queryClient)
14+
15+
const query = createInfiniteQuery(() => ({
16+
queryKey: queryKey,
17+
queryFn: ({ pageParam }) => sleep(10).then(() => pageParam),
18+
getNextPageParam: (lastPage) => lastPage + 1,
19+
initialPageParam: firstPage,
20+
}))
2121
</script>
2222

2323
<button

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@
22
import { untrack } from 'svelte'
33
import { QueryClient } from '@tanstack/query-core'
44
import { createInfiniteQuery } from '../../src/index.js'
5+
import { setQueryClientContext } from '../../src/context.js'
56
import type { QueryObserverResult } from '@tanstack/query-core'
67
import { queryKey, sleep } from '@tanstack/query-test-utils'
78
89
let { states }: { states: { value: Array<QueryObserverResult> } } = $props()
910
1011
const queryClient = new QueryClient()
12+
setQueryClientContext(queryClient)
1113
12-
const query = createInfiniteQuery(
13-
() => ({
14-
queryKey: queryKey(),
15-
queryFn: () => sleep(10).then(() => ({ count: 1 })),
16-
select: (data) => ({
17-
pages: data.pages.map((x) => `count: ${x.count}`),
18-
pageParams: data.pageParams,
19-
}),
20-
getNextPageParam: () => undefined,
21-
initialPageParam: 0,
14+
const query = createInfiniteQuery(() => ({
15+
queryKey: queryKey(),
16+
queryFn: () => sleep(10).then(() => ({ count: 1 })),
17+
select: (data) => ({
18+
pages: data.pages.map((x) => `count: ${x.count}`),
19+
pageParams: data.pageParams,
2220
}),
23-
() => queryClient,
24-
)
21+
getNextPageParam: () => undefined,
22+
initialPageParam: 0,
23+
}))
2524
2625
$effect(() => {
2726
// @ts-expect-error

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { QueryClient } from '@tanstack/query-core'
44
import { ref } from '../utils.svelte.js'
55
import BaseExample from './BaseExample.svelte'
66
import SelectExample from './SelectExample.svelte'
7-
import ChangeClient from './ChangeClient.svelte'
7+
import ChangeClientExample from './ChangeClientExample.svelte'
88
import type { QueryObserverResult } from '@tanstack/query-core'
99

1010
describe('createInfiniteQuery', () => {
@@ -133,7 +133,7 @@ describe('createInfiniteQuery', () => {
133133
it('should be able to set new pages with the query client', async () => {
134134
const queryClient = new QueryClient()
135135

136-
const rendered = render(ChangeClient, {
136+
const rendered = render(ChangeClientExample, {
137137
props: {
138138
queryClient,
139139
},

packages/svelte-query/tests/createQueries/IsRestoringExample.svelte

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<script lang="ts">
22
import { QueryClient } from '@tanstack/query-core'
33
import { queryKey } from '@tanstack/query-test-utils'
4-
import { setIsRestoringContext } from '../../src/context.js'
4+
import {
5+
setIsRestoringContext,
6+
setQueryClientContext,
7+
} from '../../src/context.js'
58
import { createQueries } from '../../src/index.js'
69
710
let {
@@ -13,18 +16,15 @@
1316
} = $props()
1417
1518
const queryClient = new QueryClient()
16-
19+
setQueryClientContext(queryClient)
1720
setIsRestoringContext({ current: true })
1821
19-
const result = createQueries(
20-
() => ({
21-
queries: [
22-
{ queryKey: queryKey(), queryFn: queryFn1 },
23-
{ queryKey: queryKey(), queryFn: queryFn2 },
24-
],
25-
}),
26-
() => queryClient,
27-
)
22+
const result = createQueries(() => ({
23+
queries: [
24+
{ queryKey: queryKey(), queryFn: queryFn1 },
25+
{ queryKey: queryKey(), queryFn: queryFn2 },
26+
],
27+
}))
2828
</script>
2929

3030
<div>

packages/svelte-query/tests/createQuery/IsRestoringExample.svelte

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<script lang="ts">
22
import { QueryClient } from '@tanstack/query-core'
33
import { queryKey } from '@tanstack/query-test-utils'
4-
import { setIsRestoringContext } from '../../src/context.js'
4+
import {
5+
setIsRestoringContext,
6+
setQueryClientContext,
7+
} from '../../src/context.js'
58
import { createQuery } from '../../src/index.js'
69
710
let {
@@ -11,16 +14,13 @@
1114
} = $props()
1215
1316
const queryClient = new QueryClient()
14-
17+
setQueryClientContext(queryClient)
1518
setIsRestoringContext({ current: true })
1619
17-
const query = createQuery(
18-
() => ({
19-
queryKey: queryKey(),
20-
queryFn,
21-
}),
22-
() => queryClient,
23-
)
20+
const query = createQuery(() => ({
21+
queryKey: queryKey(),
22+
queryFn,
23+
}))
2424
</script>
2525

2626
<div>

0 commit comments

Comments
 (0)