Skip to content

Commit 234f2f4

Browse files
sukvvonmanudeli
sukvvon
and
manudeli
authored
test(svelte-query/createQuery): simplify 'queryFn' and replace 'queryByText' with 'getByText' (#9490)
Co-authored-by: Jonghyeon Ko <manudeli.ko@gmail.com>
1 parent 80242d6 commit 234f2f4

File tree

4 files changed

+27
-58
lines changed

4 files changed

+27
-58
lines changed

‎packages/svelte-query/tests/createQuery/DisabledExample.svelte

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
1414
const options = derived(count, ($count) => ({
1515
queryKey: ['test', $count],
16-
queryFn: async () => {
17-
await sleep(5)
18-
return $count
19-
},
16+
queryFn: () => sleep(10).then(() => $count),
2017
enabled: $count === 0,
2118
}))
2219

‎packages/svelte-query/tests/createQuery/PlaceholderData.svelte

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
1313
const options = derived(count, ($count) => ({
1414
queryKey: ['test', $count],
15-
queryFn: async () => {
16-
await sleep(5)
17-
return $count
18-
},
15+
queryFn: () => sleep(10).then(() => $count),
1916
placeholderData: keepPreviousData,
2017
}))
2118

‎packages/svelte-query/tests/createQuery/RefetchExample.svelte

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
1414
const options = derived(count, ($count) => ({
1515
queryKey: ['test'],
16-
queryFn: async () => {
17-
await sleep(5)
18-
return ++$count
19-
},
16+
queryFn: () => sleep(10).then(() => ++$count),
2017
}))
2118
2219
const query = createQuery(options, queryClient)

‎packages/svelte-query/tests/createQuery/createQuery.test.ts

Lines changed: 24 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ describe('createQuery', () => {
2424

2525
const options = {
2626
queryKey: ['test'],
27-
queryFn: async () => {
28-
await sleep(5)
29-
return 'Success'
30-
},
27+
queryFn: () => sleep(10).then(() => 'Success'),
3128
}
3229

3330
const rendered = render(BaseExample, {
@@ -38,13 +35,12 @@ describe('createQuery', () => {
3835
},
3936
})
4037

41-
await vi.advanceTimersByTimeAsync(6)
42-
expect(rendered.queryByText('Status: success')).toBeInTheDocument()
38+
await vi.advanceTimersByTimeAsync(11)
39+
expect(rendered.getByText('Status: success')).toBeInTheDocument()
4340

4441
const states = get(statesStore)
4542

4643
expect(states).toHaveLength(2)
47-
4844
expect(states[0]).toMatchObject({
4945
data: undefined,
5046
dataUpdatedAt: 0,
@@ -71,7 +67,6 @@ describe('createQuery', () => {
7167
status: 'pending',
7268
fetchStatus: 'fetching',
7369
})
74-
7570
expect(states[1]).toMatchObject({
7671
data: 'Success',
7772
dataUpdatedAt: expect.any(Number),
@@ -105,9 +100,10 @@ describe('createQuery', () => {
105100

106101
const options = {
107102
queryKey: ['test'],
108-
queryFn: () => Promise.reject(new Error('Rejected')),
103+
queryFn: () =>
104+
sleep(10).then(() => Promise.reject(new Error('Rejected'))),
109105
retry: 1,
110-
retryDelay: 1,
106+
retryDelay: 10,
111107
}
112108

113109
const rendered = render(BaseExample, {
@@ -118,13 +114,12 @@ describe('createQuery', () => {
118114
},
119115
})
120116

121-
await vi.advanceTimersByTimeAsync(2)
117+
await vi.advanceTimersByTimeAsync(31)
122118
expect(rendered.getByText('Status: error')).toBeInTheDocument()
123119

124120
const states = get(statesStore)
125121

126122
expect(states).toHaveLength(3)
127-
128123
expect(states[0]).toMatchObject({
129124
data: undefined,
130125
dataUpdatedAt: 0,
@@ -151,7 +146,6 @@ describe('createQuery', () => {
151146
status: 'pending',
152147
fetchStatus: 'fetching',
153148
})
154-
155149
expect(states[1]).toMatchObject({
156150
data: undefined,
157151
dataUpdatedAt: 0,
@@ -178,7 +172,6 @@ describe('createQuery', () => {
178172
status: 'pending',
179173
fetchStatus: 'fetching',
180174
})
181-
182175
expect(states[2]).toMatchObject({
183176
data: undefined,
184177
dataUpdatedAt: 0,
@@ -212,10 +205,7 @@ describe('createQuery', () => {
212205

213206
const optionsStore = writable({
214207
queryKey: ['test'],
215-
queryFn: async () => {
216-
await sleep(5)
217-
return 'Success'
218-
},
208+
queryFn: () => sleep(10).then(() => 'Success'),
219209
})
220210

221211
const rendered = render(BaseExample, {
@@ -226,8 +216,8 @@ describe('createQuery', () => {
226216
},
227217
})
228218

229-
await vi.advanceTimersByTimeAsync(6)
230-
expect(rendered.queryByText('Status: success')).toBeInTheDocument()
219+
await vi.advanceTimersByTimeAsync(11)
220+
expect(rendered.getByText('Status: success')).toBeInTheDocument()
231221
})
232222

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

238228
const derivedStore = derived(writableStore, ($store) => ({
239229
queryKey: [$store],
240-
queryFn: async () => {
241-
await sleep(5)
242-
return 'Success'
243-
},
230+
queryFn: () => sleep(10).then(() => 'Success'),
244231
}))
245232

246233
const rendered = render(BaseExample, {
@@ -251,7 +238,7 @@ describe('createQuery', () => {
251238
},
252239
})
253240

254-
await vi.advanceTimersByTimeAsync(6)
241+
await vi.advanceTimersByTimeAsync(11)
255242
expect(rendered.queryByText('Status: success')).toBeInTheDocument()
256243
})
257244

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

263250
const derivedStore = derived(writableStore, ($store) => ({
264251
queryKey: [$store],
265-
queryFn: async () => {
266-
await sleep(5)
267-
return $store
268-
},
252+
queryFn: () => sleep(10).then(() => $store),
269253
}))
270254

271255
const rendered = render(BaseExample, {
@@ -278,20 +262,20 @@ describe('createQuery', () => {
278262
},
279263
})
280264

281-
await vi.advanceTimersByTimeAsync(6)
282-
expect(rendered.queryByText('Data: 1')).toBeInTheDocument()
265+
await vi.advanceTimersByTimeAsync(11)
266+
expect(rendered.getByText('Data: 1')).toBeInTheDocument()
283267
expect(rendered.queryByText('Data: 2')).not.toBeInTheDocument()
284268

285269
writableStore.set(2)
286270

287-
await vi.advanceTimersByTimeAsync(6)
271+
await vi.advanceTimersByTimeAsync(11)
288272
expect(rendered.queryByText('Data: 1')).not.toBeInTheDocument()
289-
expect(rendered.queryByText('Data: 2')).toBeInTheDocument()
273+
expect(rendered.getByText('Data: 2')).toBeInTheDocument()
290274

291275
writableStore.set(1)
292276

293-
await vi.advanceTimersByTimeAsync(6)
294-
expect(rendered.queryByText('Data: 1')).toBeInTheDocument()
277+
await vi.advanceTimersByTimeAsync(11)
278+
expect(rendered.getByText('Data: 1')).toBeInTheDocument()
295279
expect(rendered.queryByText('Data: 2')).not.toBeInTheDocument()
296280
})
297281

@@ -305,11 +289,11 @@ describe('createQuery', () => {
305289
},
306290
})
307291

308-
await vi.advanceTimersByTimeAsync(6)
292+
await vi.advanceTimersByTimeAsync(11)
309293
expect(rendered.getByText('Data: 0')).toBeInTheDocument()
310294

311295
fireEvent.click(rendered.getByRole('button', { name: 'setCount' }))
312-
await vi.advanceTimersByTimeAsync(6)
296+
await vi.advanceTimersByTimeAsync(11)
313297
expect(rendered.getByText('Data: 1')).toBeInTheDocument()
314298

315299
const states = get(statesStore)
@@ -323,23 +307,20 @@ describe('createQuery', () => {
323307
isSuccess: false,
324308
isPlaceholderData: false,
325309
})
326-
327310
// Fetched
328311
expect(states[1]).toMatchObject({
329312
data: 0,
330313
isFetching: false,
331314
isSuccess: true,
332315
isPlaceholderData: false,
333316
})
334-
335317
// Set state
336318
expect(states[2]).toMatchObject({
337319
data: 0,
338320
isFetching: true,
339321
isSuccess: true,
340322
isPlaceholderData: true,
341323
})
342-
343324
// New data
344325
expect(states[3]).toMatchObject({
345326
data: 1,
@@ -358,7 +339,7 @@ describe('createQuery', () => {
358339
},
359340
})
360341

361-
await vi.advanceTimersByTimeAsync(6)
342+
await vi.advanceTimersByTimeAsync(11)
362343
expect(rendered.getByText('Data: 0')).toBeInTheDocument()
363344

364345
fireEvent.click(rendered.getByRole('button', { name: /Increment/i }))
@@ -376,21 +357,18 @@ describe('createQuery', () => {
376357
isFetching: true,
377358
isSuccess: false,
378359
})
379-
380360
// Fetched query
381361
expect(states[1]).toMatchObject({
382362
data: 0,
383363
isFetching: false,
384364
isSuccess: true,
385365
})
386-
387366
// Switch to query disable
388367
expect(states[2]).toMatchObject({
389368
data: undefined,
390369
isFetching: false,
391370
isSuccess: false,
392371
})
393-
394372
// Fetched disabled query
395373
expect(states[3]).toMatchObject({
396374
data: undefined,
@@ -408,12 +386,12 @@ describe('createQuery', () => {
408386
},
409387
})
410388

411-
await vi.advanceTimersByTimeAsync(6)
389+
await vi.advanceTimersByTimeAsync(11)
412390
expect(rendered.getByText('Data: 1')).toBeInTheDocument()
413391

414392
fireEvent.click(rendered.getByRole('button', { name: /Remove/i }))
415393
fireEvent.click(rendered.getByRole('button', { name: /Refetch/i }))
416-
await vi.advanceTimersByTimeAsync(6)
394+
await vi.advanceTimersByTimeAsync(11)
417395
expect(rendered.getByText('Data: 2')).toBeInTheDocument()
418396

419397
const states = get(statesStore)

0 commit comments

Comments
 (0)