Skip to content

Commit e203306

Browse files
authored
test(svelte-query): replace hardcoded query keys with 'queryKey()' utility (#10415)
1 parent f3d3eea commit e203306

9 files changed

Lines changed: 220 additions & 146 deletions

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
22
import { render } from '@testing-library/svelte'
3-
import { sleep } from '@tanstack/query-test-utils'
3+
import { queryKey, sleep } from '@tanstack/query-test-utils'
44
import { QueryClient, createQueries } from '../../src/index.js'
55
import { promiseWithResolvers, withEffectRoot } from '../utils.svelte.js'
66
import IsRestoringExample from './IsRestoringExample.svelte'
@@ -22,8 +22,8 @@ describe('createQueries', () => {
2222
it(
2323
'should return the correct states',
2424
withEffectRoot(async () => {
25-
const key1 = ['test-1']
26-
const key2 = ['test-2']
25+
const key1 = queryKey()
26+
const key2 = queryKey()
2727
const results: Array<Array<CreateQueryResult>> = []
2828
const { promise: promise1, resolve: resolve1 } = promiseWithResolvers()
2929
const { promise: promise2, resolve: resolve2 } = promiseWithResolvers()
@@ -69,7 +69,7 @@ describe('createQueries', () => {
6969
it(
7070
'should track results',
7171
withEffectRoot(async () => {
72-
const key1 = ['test-track-results']
72+
const key1 = queryKey()
7373
const results: Array<Array<CreateQueryResult>> = []
7474
let count = 0
7575

@@ -111,8 +111,8 @@ describe('createQueries', () => {
111111
it(
112112
'should combine queries',
113113
withEffectRoot(async () => {
114-
const key1 = ['test-combine-1']
115-
const key2 = ['test-combine-2']
114+
const key1 = queryKey()
115+
const key2 = queryKey()
116116

117117
const { promise: promise1, resolve: resolve1 } =
118118
promiseWithResolvers<string>()
@@ -169,8 +169,8 @@ describe('createQueries', () => {
169169
it(
170170
'should track property access through combine function',
171171
withEffectRoot(async () => {
172-
const key1 = ['test-track-combine-1']
173-
const key2 = ['test-track-combine-2']
172+
const key1 = queryKey()
173+
const key2 = queryKey()
174174
let count = 0
175175
const results: Array<unknown> = []
176176

packages/svelte-query/tests/createQueries/createQueries.test-d.ts

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { describe, expectTypeOf, it } from 'vitest'
22
import { QueryClient } from '@tanstack/query-core'
3+
import { queryKey } from '@tanstack/query-test-utils'
34
import { createQueries, queryOptions } from '../../src/index.js'
45
import type {
56
CreateQueryOptions,
@@ -12,17 +13,19 @@ import type {
1213

1314
describe('createQueries', () => {
1415
it('should return correct data for dynamic queries with mixed result types', () => {
16+
const key1 = queryKey()
17+
const key2 = queryKey()
1518
const Queries1 = {
1619
get: () =>
1720
queryOptions({
18-
queryKey: ['key1'],
21+
queryKey: key1,
1922
queryFn: () => Promise.resolve(1),
2023
}),
2124
}
2225
const Queries2 = {
2326
get: () =>
2427
queryOptions({
25-
queryKey: ['key2'],
28+
queryKey: key2,
2629
queryFn: () => Promise.resolve(true),
2730
}),
2831
}
@@ -42,9 +45,9 @@ describe('createQueries', () => {
4245

4346
it('handles type parameter - tuple of tuples', () => {
4447
const queryClient = new QueryClient()
45-
const key1 = ['test-key-1']
46-
const key2 = ['test-key-2']
47-
const key3 = ['test-key-3']
48+
const key1 = queryKey()
49+
const key2 = queryKey()
50+
const key3 = queryKey()
4851

4952
const result1 = createQueries<
5053
[[number], [string], [Array<string>, boolean]]
@@ -157,9 +160,9 @@ describe('createQueries', () => {
157160

158161
it('handles type parameter - tuple of objects', () => {
159162
const queryClient = new QueryClient()
160-
const key1 = ['test-key-1']
161-
const key2 = ['test-key-2']
162-
const key3 = ['test-key-3']
163+
const key1 = queryKey()
164+
const key2 = queryKey()
165+
const key3 = queryKey()
163166

164167
const result1 = createQueries<
165168
[
@@ -314,10 +317,10 @@ describe('createQueries', () => {
314317

315318
it('handles array literal without type parameter to infer result type', () => {
316319
const queryClient = new QueryClient()
317-
const key1 = ['test-key-1']
318-
const key2 = ['test-key-2']
319-
const key3 = ['test-key-3']
320-
const key4 = ['test-key-4']
320+
const key1 = queryKey()
321+
const key2 = queryKey()
322+
const key3 = queryKey()
323+
const key4 = queryKey()
321324

322325
// Array.map preserves TQueryFnData
323326
const result1 = createQueries(

0 commit comments

Comments
 (0)