Skip to content

Commit 1835ded

Browse files
authored
Merge pull request #609 from vitest-dev/sync-a12c6573-1
2 parents b5df42d + b305717 commit 1835ded

File tree

5 files changed

+158
-85
lines changed

5 files changed

+158
-85
lines changed

.vitepress/config.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ export default ({ mode }: { mode: string }) => {
3131
lang: 'en-US',
3232
title: vitestName,
3333
description: vitestDescription,
34+
srcExclude: [
35+
'**/guide/examples/*',
36+
'**/guide/cli-generated.md',
37+
],
3438
locales: {
3539
root: {
3640
label: '简体中文',

guide/examples/promise-done.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
```js
2+
it('should work', (done) => { // [!code --]
3+
it('should work', () => new Promise(done => { // [!code ++]
4+
// ...
5+
done()
6+
}) // [!code --]
7+
})) // [!code ++]
8+
```

guide/migration.md

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ foo.bar() // 'Hello, mock!'
6969

7070
foo.bar.mockReset()
7171

72-
foo.bar() // undefined // [!code --]
73-
foo.bar() // 'Hello, world!' // [!code ++]
72+
foo.bar() // undefined [!code --]
73+
foo.bar() // 'Hello, world!' [!code ++]
7474
```
7575

7676
### `vi.spyOn` Reuses Mock if Method is Already Mocked
@@ -81,8 +81,8 @@ foo.bar() // 'Hello, world!' // [!code ++]
8181
vi.spyOn(fooService, 'foo').mockImplementation(() => 'bar')
8282
vi.spyOn(fooService, 'foo').mockImplementation(() => 'bar')
8383
vi.restoreAllMocks()
84-
vi.isMockFunction(fooService.foo) // true // [!code --]
85-
vi.isMockFunction(fooService.foo) // false // [!code ++]
84+
vi.isMockFunction(fooService.foo) // true [!code --]
85+
vi.isMockFunction(fooService.foo) // false [!code ++]
8686
```
8787

8888
### Fake Timers Defaults
@@ -92,8 +92,8 @@ Vitest 不再提供默认的 `fakeTimers.toFake` 选项。现在,如果存在
9292
```ts
9393
vi.useFakeTimers()
9494

95-
performance.now() // original // [!code --]
96-
performance.now() // fake // [!code ++]
95+
performance.now() // original [!code --]
96+
performance.now() // fake [!code ++]
9797
```
9898

9999
你可以通过在调用 `vi.useFakeTimers` 时或在全局配置中指定定时器来恢复到之前的行为:
@@ -102,7 +102,15 @@ performance.now() // fake // [!code ++]
102102
export default defineConfig({
103103
test: {
104104
fakeTimers: {
105-
toFake: ['setTimeout', 'clearTimeout', 'Date'], // [!code ++]
105+
toFake: [ // [!code ++]
106+
'setTimeout', // [!code ++]
107+
'clearTimeout', // [!code ++]
108+
'setInterval', // [!code ++]
109+
'clearInterval', // [!code ++]
110+
'setImmediate', // [!code ++]
111+
'clearImmediate', // [!code ++]
112+
'Date', // [!code ++]
113+
] // [!code ++]
106114
},
107115
},
108116
})
@@ -277,8 +285,8 @@ const mockAdd: Mock<typeof add> = vi.fn() // [!code ++]
277285
const fn = vi.fn().mockResolvedValueOnce('result')
278286
await fn()
279287

280-
const result = fn.mock.results[0] // 'result' // [!code --]
281-
const result = fn.mock.results[0] // 'Promise<result>' // [!code ++]
288+
const result = fn.mock.results[0] // 'result' [!code --]
289+
const result = fn.mock.results[0] // 'Promise<result>' [!code ++]
282290

283291
const settledResult = fn.mock.settledResults[0] // 'result'
284292
```
@@ -531,14 +539,7 @@ Jest 导出各种 [`jasmine`](https://jasmine.github.io/) 全局 API (例如 `ja
531539

532540
从 Vitest v0.10.0 开始,声明测试的回调样式被弃用。 你可以重写它们以使用 `async`/`await` 函数,或者使用 Promise 来模仿回调样式。
533541

534-
```
535-
it('should work', (done) => { // [!code --]
536-
it('should work', () => new Promise(done => { // [!code ++]
537-
// ...
538-
done()
539-
}) // [!code --]
540-
})) // [!code ++]
541-
```
542+
<!--@include: ./examples/promise-done.md-->
542543

543544
### 钩子
544545

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
"devDependencies": {
2424
"@antfu/eslint-config": "^3.14.0",
2525
"@antfu/ni": "^23.2.0",
26-
"@iconify-json/carbon": "^1.2.5",
26+
"@iconify-json/carbon": "^1.2.6",
2727
"@iconify-json/logos": "^1.2.4",
28-
"@shikijs/transformers": "^1.29.1",
29-
"@shikijs/vitepress-twoslash": "^1.29.1",
28+
"@shikijs/transformers": "^1.29.2",
29+
"@shikijs/vitepress-twoslash": "^1.29.2",
3030
"@types/fs-extra": "^11.0.4",
3131
"@types/node": "^22.10.7",
3232
"@unocss/reset": "^0.65.4",
@@ -52,7 +52,7 @@
5252
"vite-plugin-pwa": "^0.21.1",
5353
"vitepress": "^1.6.3",
5454
"vitepress-plugin-group-icons": "^1.3.5",
55-
"vitepress-plugin-tabs": "^0.5.0",
55+
"vitepress-plugin-tabs": "^0.6.0",
5656
"vitest": "^3.0.2",
5757
"workbox-window": "^7.3.0"
5858
}

0 commit comments

Comments
 (0)