@@ -2,17 +2,10 @@ import { createApp, h, Suspense } from 'vue'
2
2
import { renderToString } from '../src/renderToString'
3
3
import { ssrRenderSuspense } from '../src/helpers/ssrRenderSuspense'
4
4
import { ssrRenderComponent } from '../src'
5
+ import { mockError } from '@vue/shared'
5
6
6
7
describe ( 'SSR Suspense' , ( ) => {
7
- let logError : jest . SpyInstance
8
-
9
- beforeEach ( ( ) => {
10
- logError = jest . spyOn ( console , 'error' ) . mockImplementation ( ( ) => { } )
11
- } )
12
-
13
- afterEach ( ( ) => {
14
- logError . mockRestore ( )
15
- } )
8
+ mockError ( )
16
9
17
10
const ResolvingAsync = {
18
11
async setup ( ) {
@@ -41,7 +34,6 @@ describe('SSR Suspense', () => {
41
34
} )
42
35
43
36
expect ( await renderToString ( app ) ) . toBe ( `<div>async</div>` )
44
- expect ( logError ) . not . toHaveBeenCalled ( )
45
37
} )
46
38
47
39
test ( 'with async component' , async ( ) => {
@@ -58,7 +50,6 @@ describe('SSR Suspense', () => {
58
50
} )
59
51
60
52
expect ( await renderToString ( app ) ) . toBe ( `<div>async</div>` )
61
- expect ( logError ) . not . toHaveBeenCalled ( )
62
53
} )
63
54
64
55
test ( 'fallback' , async ( ) => {
@@ -78,7 +69,7 @@ describe('SSR Suspense', () => {
78
69
} )
79
70
80
71
expect ( await renderToString ( app ) ) . toBe ( `<div>fallback</div>` )
81
- expect ( logError ) . toHaveBeenCalled ( )
72
+ expect ( 'Uncaught error in async setup' ) . toHaveBeenWarned ( )
82
73
} )
83
74
} )
84
75
@@ -94,7 +85,6 @@ describe('SSR Suspense', () => {
94
85
}
95
86
96
87
expect ( await renderToString ( createApp ( Comp ) ) ) . toBe ( `<div>async</div>` )
97
- expect ( logError ) . not . toHaveBeenCalled ( )
98
88
} )
99
89
100
90
test ( 'fallback' , async ( ) => {
@@ -108,7 +98,7 @@ describe('SSR Suspense', () => {
108
98
}
109
99
110
100
expect ( await renderToString ( createApp ( Comp ) ) ) . toBe ( `<div>fallback</div>` )
111
- expect ( logError ) . toHaveBeenCalled ( )
101
+ expect ( 'Uncaught error in async setup' ) . toHaveBeenWarned ( )
112
102
} )
113
103
114
104
test ( '2 components' , async ( ) => {
@@ -124,7 +114,6 @@ describe('SSR Suspense', () => {
124
114
expect ( await renderToString ( createApp ( Comp ) ) ) . toBe (
125
115
`<div><div>async</div><div>async</div></div>`
126
116
)
127
- expect ( logError ) . not . toHaveBeenCalled ( )
128
117
} )
129
118
130
119
test ( 'resolving component + rejecting component' , async ( ) => {
@@ -138,7 +127,7 @@ describe('SSR Suspense', () => {
138
127
}
139
128
140
129
expect ( await renderToString ( createApp ( Comp ) ) ) . toBe ( `<div>fallback</div>` )
141
- expect ( logError ) . toHaveBeenCalled ( )
130
+ expect ( 'Uncaught error in async setup' ) . toHaveBeenWarned ( )
142
131
} )
143
132
144
133
test ( 'failing suspense in passing suspense' , async ( ) => {
@@ -160,7 +149,7 @@ describe('SSR Suspense', () => {
160
149
expect ( await renderToString ( createApp ( Comp ) ) ) . toBe (
161
150
`<div><div>async</div><div>fallback 2</div></div>`
162
151
)
163
- expect ( logError ) . toHaveBeenCalled ( )
152
+ expect ( 'Uncaught error in async setup' ) . toHaveBeenWarned ( )
164
153
} )
165
154
166
155
test ( 'passing suspense in failing suspense' , async ( ) => {
@@ -182,7 +171,7 @@ describe('SSR Suspense', () => {
182
171
expect ( await renderToString ( createApp ( Comp ) ) ) . toBe (
183
172
`<div>fallback 1</div>`
184
173
)
185
- expect ( logError ) . toHaveBeenCalled ( )
174
+ expect ( 'Uncaught error in async setup' ) . toHaveBeenWarned ( )
186
175
} )
187
176
} )
188
177
} )
0 commit comments