Skip to content

Commit 01212de

Browse files
test(svelte-query): Refactor test logic (#7744)
* test(svelte-query): Simplify test logic * Improve createQueries tests
1 parent 5c50ca7 commit 01212de

File tree

32 files changed

+262
-205
lines changed

32 files changed

+262
-205
lines changed

examples/svelte/auto-refetching/src/routes/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
transition:: {!$todos.isFetching ? 'all .3s ease' : 'none'};
5454
border-radius: 100%;
5555
transform: 'scale(2)"
56-
/>
56+
></span>
5757
</div>
5858
</label>
5959
<h2>Todo List</h2>

examples/svelte/load-more-infinite-scroll/src/lib/LoadMore.svelte

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@
2121
return undefined
2222
},
2323
})
24-
25-
const { error }: { error: any } = $query
2624
</script>
2725

2826
{#if $query.isPending}
2927
Loading...
3028
{/if}
3129
{#if $query.error}
32-
<span>Error: {error.message}</span>
30+
<span>Error: {$query.error.message}</span>
3331
{/if}
3432
{#if $query.isSuccess}
3533
<div>

packages/svelte-query-persist-client/tests/AwaitOnSuccess/AwaitOnSuccess.svelte

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
import { sleep } from '../utils'
44
import type { Writable } from 'svelte/store'
55
6-
export let key: Array<string>
76
export let states: Writable<Array<string>>
87
9-
const state = createQuery({
10-
queryKey: key,
8+
const query = createQuery({
9+
queryKey: ['test'],
1110
queryFn: async () => {
1211
states.update((s) => [...s, 'fetching'])
1312
await sleep(10)
@@ -17,7 +16,5 @@
1716
})
1817
</script>
1918

20-
<div>
21-
<h1>{$state.data}</h1>
22-
<h2>fetchStatus: {$state.fetchStatus}</h2>
23-
</div>
19+
<div>{$query.data}</div>
20+
<div>fetchStatus: {$query.fetchStatus}</div>

packages/svelte-query-persist-client/tests/AwaitOnSuccess/Provider.svelte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
88
export let queryClient: QueryClient
99
export let persistOptions: OmitKeyof<PersistQueryClientOptions, 'queryClient'>
10-
export let key: Array<string>
1110
export let onSuccess: () => Promise<void>
1211
export let states: Writable<Array<string>>
1312
</script>
1413

1514
<PersistQueryClientProvider client={queryClient} {persistOptions} {onSuccess}>
16-
<AwaitOnSuccess {key} {states} />
15+
<AwaitOnSuccess {states} />
1716
</PersistQueryClientProvider>

packages/svelte-query-persist-client/tests/FreshData/FreshData.svelte

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
import type { Writable } from 'svelte/store'
55
import type { StatusResult } from '../utils'
66
7-
export let key: Array<string>
87
export let states: Writable<Array<StatusResult<string>>>
98
export let fetched: Writable<boolean>
109
11-
const state = createQuery({
12-
queryKey: key,
10+
const query = createQuery({
11+
queryKey: ['test'],
1312
queryFn: async () => {
1413
fetched.set(true)
1514
await sleep(10)
@@ -19,10 +18,8 @@
1918
staleTime: Infinity,
2019
})
2120
22-
$: states.update((prev) => [...prev, $state])
21+
$: states.update((prev) => [...prev, $query])
2322
</script>
2423

25-
<div>
26-
<h1>data: {$state.data ?? 'null'}</h1>
27-
<h2>fetchStatus: {$state.fetchStatus}</h2>
28-
</div>
24+
<div>data: {$query.data ?? 'null'}</div>
25+
<div>fetchStatus: {$query.fetchStatus}</div>

packages/svelte-query-persist-client/tests/FreshData/Provider.svelte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
99
export let queryClient: QueryClient
1010
export let persistOptions: OmitKeyof<PersistQueryClientOptions, 'queryClient'>
11-
export let key: Array<string>
1211
export let states: Writable<Array<StatusResult<string>>>
1312
export let fetched: Writable<boolean>
1413
</script>
1514

1615
<PersistQueryClientProvider client={queryClient} {persistOptions}>
17-
<FreshData {key} {states} {fetched} />
16+
<FreshData {states} {fetched} />
1817
</PersistQueryClientProvider>

packages/svelte-query-persist-client/tests/InitialData/InitialData.svelte

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
import type { Writable } from 'svelte/store'
55
import type { StatusResult } from '../utils'
66
7-
export let key: Array<string>
87
export let states: Writable<Array<StatusResult<string>>>
98
10-
const state = createQuery({
11-
queryKey: key,
9+
const query = createQuery({
10+
queryKey: ['test'],
1211
queryFn: async () => {
1312
await sleep(10)
1413
return 'fetched'
@@ -20,10 +19,8 @@
2019
initialDataUpdatedAt: 1,
2120
})
2221
23-
$: states.update((prev) => [...prev, $state])
22+
$: states.update((prev) => [...prev, $query])
2423
</script>
2524

26-
<div>
27-
<h1>{$state.data}</h1>
28-
<h2>fetchStatus: {$state.fetchStatus}</h2>
29-
</div>
25+
<div>{$query.data}</div>
26+
<div>fetchStatus: {$query.fetchStatus}</div>

packages/svelte-query-persist-client/tests/InitialData/Provider.svelte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
99
export let queryClient: QueryClient
1010
export let persistOptions: OmitKeyof<PersistQueryClientOptions, 'queryClient'>
11-
export let key: Array<string>
1211
export let states: Writable<Array<StatusResult<string>>>
1312
</script>
1413

1514
<PersistQueryClientProvider client={queryClient} {persistOptions}>
16-
<InitialData {key} {states} />
15+
<InitialData {states} />
1716
</PersistQueryClientProvider>

packages/svelte-query-persist-client/tests/OnSuccess/OnSuccess.svelte

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22
import { createQuery } from '@tanstack/svelte-query'
33
import { sleep } from '../utils'
44
5-
export let key: Array<string>
6-
7-
const state = createQuery({
8-
queryKey: key,
5+
const query = createQuery({
6+
queryKey: ['test'],
97
queryFn: async () => {
108
await sleep(10)
119
return 'fetched'
1210
},
1311
})
1412
</script>
1513

16-
<div>
17-
<h1>{$state.data}</h1>
18-
<h2>fetchStatus: {$state.fetchStatus}</h2>
19-
</div>
14+
<div>{$query.data}</div>
15+
<div>fetchStatus: {$query.fetchStatus}</div>

packages/svelte-query-persist-client/tests/OnSuccess/Provider.svelte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
77
export let queryClient: QueryClient
88
export let persistOptions: OmitKeyof<PersistQueryClientOptions, 'queryClient'>
9-
export let key: Array<string>
109
export let onSuccess: () => void
1110
</script>
1211

1312
<PersistQueryClientProvider client={queryClient} {persistOptions} {onSuccess}>
14-
<OnSuccess {key} />
13+
<OnSuccess />
1514
</PersistQueryClientProvider>

0 commit comments

Comments
 (0)