diff --git a/packages/svelte-query-persist-client/tests/AwaitOnSuccess/Provider.svelte b/packages/svelte-query-persist-client/tests/AwaitOnSuccess/Provider.svelte index e94ef3616a..c3087ac2fa 100644 --- a/packages/svelte-query-persist-client/tests/AwaitOnSuccess/Provider.svelte +++ b/packages/svelte-query-persist-client/tests/AwaitOnSuccess/Provider.svelte @@ -7,11 +7,10 @@ export let queryClient: QueryClient export let persistOptions: OmitKeyof - export let key: Array export let onSuccess: () => Promise export let states: Writable> - + diff --git a/packages/svelte-query/tests/createQueries/BaseExample.svelte b/packages/svelte-query/tests/createQueries/BaseExample.svelte index 6401f34b10..7f285fbb18 100644 --- a/packages/svelte-query/tests/createQueries/BaseExample.svelte +++ b/packages/svelte-query/tests/createQueries/BaseExample.svelte @@ -1,27 +1,17 @@ -{#if Array.isArray($queries)} - {#each $queries as query, index} - {#if query.isPending} -
Loading {index + 1}
- {:else if query.isSuccess} -
{query.data}
- {/if} - {/each} -{:else if $queries.isPending} -
Loading
-{:else if $queries.isSuccess} -
{$queries.data}
-{/if} +{#each $queries as query, index} +
Status {index + 1}: {query.status}
+
Data {index + 1}: {query.data}
+{/each} diff --git a/packages/svelte-query/tests/createQueries/CombineExample.svelte b/packages/svelte-query/tests/createQueries/CombineExample.svelte new file mode 100644 index 0000000000..a37b266db1 --- /dev/null +++ b/packages/svelte-query/tests/createQueries/CombineExample.svelte @@ -0,0 +1,32 @@ + + +
isPending: {$queries.isPending}
+
Data: {$queries.data ?? 'undefined'}
diff --git a/packages/svelte-query/tests/createQueries/createQueries.test.ts b/packages/svelte-query/tests/createQueries/createQueries.test.ts index 8e07306210..91a6f8da3b 100644 --- a/packages/svelte-query/tests/createQueries/createQueries.test.ts +++ b/packages/svelte-query/tests/createQueries/createQueries.test.ts @@ -3,6 +3,7 @@ import { render, waitFor } from '@testing-library/svelte' import { QueryClient } from '@tanstack/query-core' import { sleep } from '../utils' import BaseExample from './BaseExample.svelte' +import CombineExample from './CombineExample.svelte' describe('createQueries', () => { test('Render and wait for success', async () => { @@ -31,47 +32,29 @@ describe('createQueries', () => { }) await waitFor(() => { - expect(rendered.getByText('Loading 1')).toBeInTheDocument() - expect(rendered.getByText('Loading 2')).toBeInTheDocument() + expect(rendered.getByText('Status 1: pending')).toBeInTheDocument() + expect(rendered.getByText('Status 2: pending')).toBeInTheDocument() }) await waitFor(() => { - expect(rendered.getByText('Success 1')).toBeInTheDocument() - expect(rendered.getByText('Success 2')).toBeInTheDocument() + expect(rendered.getByText('Status 1: success')).toBeInTheDocument() + expect(rendered.getByText('Status 2: success')).toBeInTheDocument() }) }) test('Combine queries', async () => { - const ids = [1, 2, 3] - - const rendered = render(BaseExample, { + const rendered = render(CombineExample, { props: { - options: { - queries: ids.map((id) => ({ - queryKey: [id], - queryFn: async () => { - await sleep(5) - return id - }, - })), - combine: (results) => { - return { - isPending: results.some((result) => result.isPending), - isSuccess: results.every((result) => result.isSuccess), - data: results.map((res) => res.data).join(','), - } - }, - }, queryClient: new QueryClient(), }, }) await waitFor(() => { - expect(rendered.getByText('Loading')).toBeInTheDocument() + expect(rendered.getByText('isPending: true')).toBeInTheDocument() }) await waitFor(() => { - expect(rendered.getByText('1,2,3')).toBeInTheDocument() + expect(rendered.getByText('Data: 1,2,3')).toBeInTheDocument() }) }) })