Improve createQueries tests

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

@@ -7,11 +7,10 @@
 
   export let queryClient: QueryClient
   export let persistOptions: OmitKeyof<PersistQueryClientOptions, 'queryClient'>
-  export let key: Array<string>
   export let onSuccess: () => Promise<void>
   export let states: Writable<Array<string>>
 </script>
 
 <PersistQueryClientProvider client={queryClient} {persistOptions} {onSuccess}>
-  <AwaitOnSuccess {key} {states} />
+  <AwaitOnSuccess {states} />
 </PersistQueryClientProvider>

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

@@ -1,27 +1,17 @@
 <script lang="ts">
   import { createQueries } from '../../src/createQueries'
   import type { QueryClient } from '@tanstack/query-core'
-  import type { QueriesOptions, QueriesResults } from '../../src/createQueries'
+  import type { QueriesOptions } from '../../src/createQueries'
 
   export let options: {
     queries: [...QueriesOptions<any>]
-    combine?: (result: QueriesResults<Array<any>>) => any
   }
   export let queryClient: QueryClient
 
   const queries = createQueries(options, queryClient)
 </script>
 
-{#if Array.isArray($queries)}
-  {#each $queries as query, index}
-    {#if query.isPending}
-      <div>Loading {index + 1}</div>
-    {:else if query.isSuccess}
-      <div>{query.data}</div>
-    {/if}
-  {/each}
-{:else if $queries.isPending}
-  <div>Loading</div>
-{:else if $queries.isSuccess}
-  <div>{$queries.data}</div>
-{/if}
+{#each $queries as query, index}
+  <div>Status {index + 1}: {query.status}</div>
+  <div>Data {index + 1}: {query.data}</div>
+{/each}

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

@@ -0,0 +1,32 @@
+<script lang="ts">
+  import { createQueries } from '../../src/createQueries'
+  import { sleep } from '../utils'
+  import type { QueryClient } from '@tanstack/query-core'
+
+  export let queryClient: QueryClient
+
+  const ids = [1, 2, 3]
+
+  const queries = createQueries(
+    {
+      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,
+  )
+</script>
+
+<div>isPending: {$queries.isPending}</div>
+<div>Data: {$queries.data ?? 'undefined'}</div>

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()
     })
   })
 })