Skip to content

Commit 8cb894e

Browse files
9romise9romise
authored
test: restore real timers after each cases (#5302)
1 parent 51198e8 commit 8cb894e

File tree

27 files changed

+187
-60
lines changed

27 files changed

+187
-60
lines changed

‎packages/core/computedAsync/index.test.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { ComputedRef, Ref } from 'vue'
2-
import { describe, expect, expectTypeOf, it, vi } from 'vitest'
2+
import { afterEach, beforeEach, describe, expect, expectTypeOf, it, vi } from 'vitest'
33
import { computed, nextTick, shallowRef } from 'vue'
44
import { asyncComputed, computedAsync } from './index'
55

@@ -18,6 +18,14 @@ describe('computed', () => {
1818
})
1919

2020
describe('computedAsync', () => {
21+
beforeEach(() => {
22+
vi.useFakeTimers()
23+
})
24+
25+
afterEach(() => {
26+
vi.useRealTimers()
27+
})
28+
2129
it('export module', () => {
2230
expect(computedAsync).toBeDefined()
2331
expect(asyncComputed).toBeDefined()
@@ -193,7 +201,6 @@ describe('computedAsync', () => {
193201
})
194202

195203
it('evaluating works', async () => {
196-
vi.useFakeTimers()
197204
const evaluating = shallowRef(false)
198205

199206
const data = computedAsync(
@@ -241,7 +248,6 @@ describe('computedAsync', () => {
241248
})
242249

243250
it('cancel is called', async () => {
244-
vi.useFakeTimers()
245251
const onCancel = vi.fn()
246252
const evaluating = shallowRef(false)
247253

‎packages/core/onLongPress/index.test.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Ref } from 'vue'
2-
import { beforeEach, describe, expect, it, vi } from 'vitest'
2+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
33
import { shallowRef } from 'vue'
44
import { useEventListener } from '../useEventListener'
55
import { onLongPress } from './index'
@@ -15,6 +15,10 @@ describe('onLongPress', () => {
1515
vi.useFakeTimers()
1616
})
1717

18+
afterEach(() => {
19+
vi.useRealTimers()
20+
})
21+
1822
async function triggerCallback(isRef: boolean) {
1923
const onLongPressCallback = vi.fn()
2024
onLongPress(isRef ? element : element.value, onLongPressCallback)

‎packages/core/useAsyncQueue/index.test.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,8 @@ describe('useAsyncQueue', () => {
137137
})
138138

139139
it('should trigger onFinished when the last task is rejected', async () => {
140-
const p3 = () => {
141-
return new Promise((resolve, reject) => {
142-
setTimeout(() => {
143-
reject(new Error('reject'))
144-
}, 30)
145-
})
146-
}
147140
const onFinishedSpy = vi.fn()
148-
useAsyncQueue([p1, p2, p3], {
141+
useAsyncQueue([p1, p2, pError], {
149142
onFinished: onFinishedSpy,
150143
})
151144
await vi.waitFor(() => {

‎packages/core/useCountdown/index.test.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import type { Pausable } from '@vueuse/shared'
22
import type { UseCountdownOptions } from './index'
3-
import { beforeEach, describe, expect, it, vi } from 'vitest'
3+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
44
import { effectScope, shallowRef } from 'vue'
55
import { useCountdown } from './index'
66

77
describe('useCountdown', () => {
8-
vi.useFakeTimers()
98
let tickCallback = vi.fn()
109
let completeCallback = vi.fn()
1110
let countdown = 3
@@ -19,6 +18,8 @@ describe('useCountdown', () => {
1918
}
2019

2120
beforeEach(() => {
21+
vi.useFakeTimers()
22+
2223
tickCallback = vi.fn()
2324
completeCallback = vi.fn()
2425
countdown = 3
@@ -31,6 +32,10 @@ describe('useCountdown', () => {
3132
}
3233
})
3334

35+
afterEach(() => {
36+
vi.useRealTimers()
37+
})
38+
3439
async function exec({ isActive, pause, resume }: Pausable) {
3540
expect(isActive.value).toBeTruthy()
3641
expect(completeCallback).toHaveBeenCalledTimes(0)

‎packages/core/useIdle/index.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('useIdle', () => {
88
})
99

1010
afterEach(() => {
11-
vi.restoreAllMocks()
11+
vi.useRealTimers()
1212
})
1313

1414
it('should initialize with correct default values', () => {

‎packages/core/useNow/index.test.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
import { mount } from '@vue/test-utils'
2-
import { describe, expect, it, vi } from 'vitest'
2+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
33
import { UseNow } from './component'
44
import { useNow } from './index'
55

66
describe('useNow', () => {
7-
vi.useFakeTimers()
7+
beforeEach(() => {
8+
vi.useFakeTimers()
9+
})
10+
11+
afterEach(() => {
12+
vi.useRealTimers()
13+
})
814

915
it('should get now timestamp by default', async () => {
1016
const now = useNow()

‎packages/core/useStorageAsync/index.test.ts‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Awaitable, StorageLikeAsync } from '@vueuse/core'
22
import { createEventHook, useStorageAsync } from '@vueuse/core'
3-
import { beforeEach, describe, expect, it } from 'vitest'
3+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
44

55
const KEY = 'custom-key'
66
const KEY2 = 'custom-key2'
@@ -38,6 +38,11 @@ class AsyncStubStorage implements StorageLikeAsync {
3838
describe('useStorageAsync', () => {
3939
beforeEach(() => {
4040
localStorage.clear()
41+
vi.useFakeTimers()
42+
})
43+
44+
afterEach(() => {
45+
vi.useRealTimers()
4146
})
4247

4348
it('onReady', async () => {
@@ -60,7 +65,9 @@ describe('useStorageAsync', () => {
6065
)
6166

6267
expect(storage.value).toBe('')
63-
await expect(promise).resolves.toBe('CurrentValue')
68+
vi.waitFor(async () => {
69+
await expect(promise).resolves.toBe('CurrentValue')
70+
})
6471
})
6572

6673
it('onReadyByPromise', async () => {
@@ -74,7 +81,8 @@ describe('useStorageAsync', () => {
7481

7582
expect(storage.value).toBe('')
7683

77-
storage.then((result) => {
84+
vi.waitFor(async () => {
85+
const result = await storage
7886
expect(result.value).toBe('AnotherValue')
7987
})
8088
})

‎packages/core/useThrottledRefHistory/index.test.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1-
import { describe, expect, it, vi } from 'vitest'
1+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
22
import { shallowRef } from 'vue'
33
import { useThrottledRefHistory } from './index'
44

55
describe('useThrottledRefHistory - sync', () => {
6-
it('take first snapshot right after data was changed and second after given time', async () => {
6+
beforeEach(() => {
77
vi.useFakeTimers()
8+
})
9+
10+
afterEach(() => {
11+
vi.useRealTimers()
12+
})
13+
14+
it('take first snapshot right after data was changed and second after given time', async () => {
815
const ms = 10
916
const v = shallowRef(0)
1017

‎packages/core/useTimeAgo/index.test.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,12 @@ describe('useTimeAgo', () => {
3030
const changeValue = shallowRef(0)
3131
let changeTime: ComputedRef<number>
3232

33-
function reset() {
33+
beforeEach(() => {
3434
vi.useFakeTimers()
3535
baseTime = timestamp()
3636
vi.setSystemTime(baseTime)
3737
changeValue.value = 0
3838
changeTime = computed(() => baseTime + changeValue.value)
39-
}
40-
41-
beforeEach(() => {
42-
reset()
4339
})
4440

4541
afterEach(() => {

‎packages/core/useTimeoutPoll/index.test.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { beforeEach, describe, expect, it, vi } from 'vitest'
1+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
22
import { effectScope, shallowRef } from 'vue'
33
import { useTimeoutPoll } from './index'
44

@@ -7,6 +7,10 @@ describe('useTimeoutPoll', () => {
77
vi.useFakeTimers()
88
})
99

10+
afterEach(() => {
11+
vi.useRealTimers()
12+
})
13+
1014
it('basic pause/resume', async () => {
1115
const callback = vi.fn()
1216
const interval = shallowRef(0)

0 commit comments

Comments
 (0)