@@ -46,45 +46,40 @@ describe('ErrorBoundaryReconciliation', () => {
46
46
fail ? < InvalidType /> : < span prop = "BrokenRender" /> ;
47
47
} ) ;
48
48
49
- [ true , false ] . forEach ( isConcurrent => {
50
- async function sharedTest ( ErrorBoundary , fallbackTagName ) {
51
- let renderer ;
49
+ async function sharedTest ( ErrorBoundary , fallbackTagName ) {
50
+ let renderer ;
52
51
52
+ await act ( ( ) => {
53
+ renderer = ReactTestRenderer . create (
54
+ < ErrorBoundary fallbackTagName = { fallbackTagName } >
55
+ < BrokenRender fail = { false } />
56
+ </ ErrorBoundary > ,
57
+ { unstable_isConcurrent : true } ,
58
+ ) ;
59
+ } ) ;
60
+ expect ( renderer ) . toMatchRenderedOutput ( < span prop = "BrokenRender" /> ) ;
61
+ await expect ( async ( ) => {
53
62
await act ( ( ) => {
54
- renderer = ReactTestRenderer . create (
63
+ renderer . update (
55
64
< ErrorBoundary fallbackTagName = { fallbackTagName } >
56
- < BrokenRender fail = { false } />
65
+ < BrokenRender fail = { true } />
57
66
</ ErrorBoundary > ,
58
- { unstable_isConcurrent : isConcurrent } ,
59
67
) ;
60
68
} ) ;
61
- expect ( renderer ) . toMatchRenderedOutput ( < span prop = "BrokenRender" /> ) ;
62
-
63
- await expect ( async ( ) => {
64
- await act ( ( ) => {
65
- renderer . update (
66
- < ErrorBoundary fallbackTagName = { fallbackTagName } >
67
- < BrokenRender fail = { true } />
68
- </ ErrorBoundary > ,
69
- ) ;
70
- } ) ;
71
- } ) . toErrorDev ( isConcurrent ? [ 'invalid' , 'invalid' ] : [ 'invalid' ] ) ;
72
- const Fallback = fallbackTagName ;
73
- expect ( renderer ) . toMatchRenderedOutput ( < Fallback prop = "ErrorBoundary" /> ) ;
74
- }
69
+ } ) . toErrorDev ( [ 'invalid' , 'invalid' ] ) ;
70
+ const Fallback = fallbackTagName ;
71
+ expect ( renderer ) . toMatchRenderedOutput ( < Fallback prop = "ErrorBoundary" /> ) ;
72
+ }
75
73
76
- describe ( isConcurrent ? 'concurrent' : 'sync' , ( ) => {
77
- it ( 'componentDidCatch can recover by rendering an element of the same type' , ( ) =>
78
- sharedTest ( DidCatchErrorBoundary , 'span' ) ) ;
74
+ it ( 'componentDidCatch can recover by rendering an element of the same type' , ( ) =>
75
+ sharedTest ( DidCatchErrorBoundary , 'span' ) ) ;
79
76
80
- it ( 'componentDidCatch can recover by rendering an element of a different type' , ( ) =>
81
- sharedTest ( DidCatchErrorBoundary , 'div' ) ) ;
77
+ it ( 'componentDidCatch can recover by rendering an element of a different type' , ( ) =>
78
+ sharedTest ( DidCatchErrorBoundary , 'div' ) ) ;
82
79
83
- it ( 'getDerivedStateFromError can recover by rendering an element of the same type' , ( ) =>
84
- sharedTest ( GetDerivedErrorBoundary , 'span' ) ) ;
80
+ it ( 'getDerivedStateFromError can recover by rendering an element of the same type' , ( ) =>
81
+ sharedTest ( GetDerivedErrorBoundary , 'span' ) ) ;
85
82
86
- it ( 'getDerivedStateFromError can recover by rendering an element of a different type' , ( ) =>
87
- sharedTest ( GetDerivedErrorBoundary , 'div' ) ) ;
88
- } ) ;
89
- } ) ;
83
+ it ( 'getDerivedStateFromError can recover by rendering an element of a different type' , ( ) =>
84
+ sharedTest ( GetDerivedErrorBoundary , 'div' ) ) ;
90
85
} ) ;
0 commit comments