Skip to content

test(svelte-query/createQuery): simplify 'queryFn' and replace 'queryByText' with 'getByText' #9490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 25, 2025
Merged

test(svelte-query/createQuery): simplify 'queryFn' and replace 'queryByText' with 'getByText' #9490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb58234
test(svelte-query/createQuery): simplify 'queryFn' and replace 'query…
sukvvon Jul 23, 2025
85c3810
Merge branch 'main' into test/svelte-query-createQuery-simplify-query…
manudeli Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions packages/svelte-query/tests/createQuery/DisabledExample.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@

const options = derived(count, ($count) => ({
queryKey: ['test', $count],
queryFn: async () => {
await sleep(5)
return $count
},
queryFn: () => sleep(10).then(() => $count),
enabled: $count === 0,
}))

Expand Down
5 changes: 1 addition & 4 deletions packages/svelte-query/tests/createQuery/PlaceholderData.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@

const options = derived(count, ($count) => ({
queryKey: ['test', $count],
queryFn: async () => {
await sleep(5)
return $count
},
queryFn: () => sleep(10).then(() => $count),
placeholderData: keepPreviousData,
}))

Expand Down
5 changes: 1 addition & 4 deletions packages/svelte-query/tests/createQuery/RefetchExample.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@

const options = derived(count, ($count) => ({
queryKey: ['test'],
queryFn: async () => {
await sleep(5)
return ++$count
},
queryFn: () => sleep(10).then(() => ++$count),
}))

const query = createQuery(options, queryClient)
Expand Down
70 changes: 24 additions & 46 deletions packages/svelte-query/tests/createQuery/createQuery.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ describe('createQuery', () => {

const options = {
queryKey: ['test'],
queryFn: async () => {
await sleep(5)
return 'Success'
},
queryFn: () => sleep(10).then(() => 'Success'),
}

const rendered = render(BaseExample, {
Expand All @@ -38,13 +35,12 @@ describe('createQuery', () => {
},
})

await vi.advanceTimersByTimeAsync(6)
expect(rendered.queryByText('Status: success')).toBeInTheDocument()
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('Status: success')).toBeInTheDocument()

const states = get(statesStore)

expect(states).toHaveLength(2)

expect(states[0]).toMatchObject({
data: undefined,
dataUpdatedAt: 0,
Expand All @@ -71,7 +67,6 @@ describe('createQuery', () => {
status: 'pending',
fetchStatus: 'fetching',
})

expect(states[1]).toMatchObject({
data: 'Success',
dataUpdatedAt: expect.any(Number),
Expand Down Expand Up @@ -105,9 +100,10 @@ describe('createQuery', () => {

const options = {
queryKey: ['test'],
queryFn: () => Promise.reject(new Error('Rejected')),
queryFn: () =>
sleep(10).then(() => Promise.reject(new Error('Rejected'))),
retry: 1,
retryDelay: 1,
retryDelay: 10,
}

const rendered = render(BaseExample, {
Expand All @@ -118,13 +114,12 @@ describe('createQuery', () => {
},
})

await vi.advanceTimersByTimeAsync(2)
await vi.advanceTimersByTimeAsync(31)
expect(rendered.getByText('Status: error')).toBeInTheDocument()

const states = get(statesStore)

expect(states).toHaveLength(3)

expect(states[0]).toMatchObject({
data: undefined,
dataUpdatedAt: 0,
Expand All @@ -151,7 +146,6 @@ describe('createQuery', () => {
status: 'pending',
fetchStatus: 'fetching',
})

expect(states[1]).toMatchObject({
data: undefined,
dataUpdatedAt: 0,
Expand All @@ -178,7 +172,6 @@ describe('createQuery', () => {
status: 'pending',
fetchStatus: 'fetching',
})

expect(states[2]).toMatchObject({
data: undefined,
dataUpdatedAt: 0,
Expand Down Expand Up @@ -212,10 +205,7 @@ describe('createQuery', () => {

const optionsStore = writable({
queryKey: ['test'],
queryFn: async () => {
await sleep(5)
return 'Success'
},
queryFn: () => sleep(10).then(() => 'Success'),
})

const rendered = render(BaseExample, {
Expand All @@ -226,8 +216,8 @@ describe('createQuery', () => {
},
})

await vi.advanceTimersByTimeAsync(6)
expect(rendered.queryByText('Status: success')).toBeInTheDocument()
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('Status: success')).toBeInTheDocument()
})

test('Accept a derived store for options', async () => {
Expand All @@ -237,10 +227,7 @@ describe('createQuery', () => {

const derivedStore = derived(writableStore, ($store) => ({
queryKey: [$store],
queryFn: async () => {
await sleep(5)
return 'Success'
},
queryFn: () => sleep(10).then(() => 'Success'),
}))

const rendered = render(BaseExample, {
Expand All @@ -251,7 +238,7 @@ describe('createQuery', () => {
},
})

await vi.advanceTimersByTimeAsync(6)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.queryByText('Status: success')).toBeInTheDocument()
})

Expand All @@ -262,10 +249,7 @@ describe('createQuery', () => {

const derivedStore = derived(writableStore, ($store) => ({
queryKey: [$store],
queryFn: async () => {
await sleep(5)
return $store
},
queryFn: () => sleep(10).then(() => $store),
}))

const rendered = render(BaseExample, {
Expand All @@ -278,20 +262,20 @@ describe('createQuery', () => {
},
})

await vi.advanceTimersByTimeAsync(6)
expect(rendered.queryByText('Data: 1')).toBeInTheDocument()
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('Data: 1')).toBeInTheDocument()
expect(rendered.queryByText('Data: 2')).not.toBeInTheDocument()

writableStore.set(2)

await vi.advanceTimersByTimeAsync(6)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.queryByText('Data: 1')).not.toBeInTheDocument()
expect(rendered.queryByText('Data: 2')).toBeInTheDocument()
expect(rendered.getByText('Data: 2')).toBeInTheDocument()

writableStore.set(1)

await vi.advanceTimersByTimeAsync(6)
expect(rendered.queryByText('Data: 1')).toBeInTheDocument()
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('Data: 1')).toBeInTheDocument()
expect(rendered.queryByText('Data: 2')).not.toBeInTheDocument()
})

Expand All @@ -305,11 +289,11 @@ describe('createQuery', () => {
},
})

await vi.advanceTimersByTimeAsync(6)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('Data: 0')).toBeInTheDocument()

fireEvent.click(rendered.getByRole('button', { name: 'setCount' }))
await vi.advanceTimersByTimeAsync(6)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('Data: 1')).toBeInTheDocument()

const states = get(statesStore)
Expand All @@ -323,23 +307,20 @@ describe('createQuery', () => {
isSuccess: false,
isPlaceholderData: false,
})

// Fetched
expect(states[1]).toMatchObject({
data: 0,
isFetching: false,
isSuccess: true,
isPlaceholderData: false,
})

// Set state
expect(states[2]).toMatchObject({
data: 0,
isFetching: true,
isSuccess: true,
isPlaceholderData: true,
})

// New data
expect(states[3]).toMatchObject({
data: 1,
Expand All @@ -358,7 +339,7 @@ describe('createQuery', () => {
},
})

await vi.advanceTimersByTimeAsync(6)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('Data: 0')).toBeInTheDocument()

fireEvent.click(rendered.getByRole('button', { name: /Increment/i }))
Expand All @@ -376,21 +357,18 @@ describe('createQuery', () => {
isFetching: true,
isSuccess: false,
})

// Fetched query
expect(states[1]).toMatchObject({
data: 0,
isFetching: false,
isSuccess: true,
})

// Switch to query disable
expect(states[2]).toMatchObject({
data: undefined,
isFetching: false,
isSuccess: false,
})

// Fetched disabled query
expect(states[3]).toMatchObject({
data: undefined,
Expand All @@ -408,12 +386,12 @@ describe('createQuery', () => {
},
})

await vi.advanceTimersByTimeAsync(6)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('Data: 1')).toBeInTheDocument()

fireEvent.click(rendered.getByRole('button', { name: /Remove/i }))
fireEvent.click(rendered.getByRole('button', { name: /Refetch/i }))
await vi.advanceTimersByTimeAsync(6)
await vi.advanceTimersByTimeAsync(11)
expect(rendered.getByText('Data: 2')).toBeInTheDocument()

const states = get(statesStore)
Expand Down
Loading