9
9
10
10
'use strict' ;
11
11
12
- let ReactFeatureFlags ;
13
- let enableNewScheduler ;
14
12
let React ;
15
13
let ReactDOM ;
16
14
let Scheduler ;
@@ -21,8 +19,6 @@ describe('ReactDOMHooks', () => {
21
19
beforeEach ( ( ) => {
22
20
jest . resetModules ( ) ;
23
21
24
- ReactFeatureFlags = require ( 'shared/ReactFeatureFlags' ) ;
25
- enableNewScheduler = ReactFeatureFlags . enableNewScheduler ;
26
22
React = require ( 'react' ) ;
27
23
ReactDOM = require ( 'react-dom' ) ;
28
24
Scheduler = require ( 'scheduler' ) ;
@@ -101,30 +97,15 @@ describe('ReactDOMHooks', () => {
101
97
}
102
98
103
99
ReactDOM . render ( < Foo /> , container ) ;
104
-
105
- if ( enableNewScheduler ) {
106
- // The old behavior was accidental; in the new scheduler, flushing passive
107
- // effects also flushes synchronous work, even inside batchedUpdates.
108
- ReactDOM . unstable_batchedUpdates ( ( ) => {
109
- _set ( 0 ) ; // Forces the effect to be flushed
110
- expect ( otherContainer . textContent ) . toBe ( 'A' ) ;
111
- ReactDOM . render ( < B /> , otherContainer ) ;
112
- expect ( otherContainer . textContent ) . toBe ( 'A' ) ;
113
- } ) ;
114
- expect ( otherContainer . textContent ) . toBe ( 'B' ) ;
115
- expect ( calledA ) . toBe ( true ) ;
116
- expect ( calledB ) . toBe ( true ) ;
117
- } else {
118
- ReactDOM . unstable_batchedUpdates ( ( ) => {
119
- _set ( 0 ) ; // Forces the effect to be flushed
120
- expect ( otherContainer . textContent ) . toBe ( '' ) ;
121
- ReactDOM . render ( < B /> , otherContainer ) ;
122
- expect ( otherContainer . textContent ) . toBe ( '' ) ;
123
- } ) ;
124
- expect ( otherContainer . textContent ) . toBe ( 'B' ) ;
125
- expect ( calledA ) . toBe ( false ) ; // It was in a batch
126
- expect ( calledB ) . toBe ( true ) ;
127
- }
100
+ ReactDOM . unstable_batchedUpdates ( ( ) => {
101
+ _set ( 0 ) ; // Forces the effect to be flushed
102
+ expect ( otherContainer . textContent ) . toBe ( 'A' ) ;
103
+ ReactDOM . render ( < B /> , otherContainer ) ;
104
+ expect ( otherContainer . textContent ) . toBe ( 'A' ) ;
105
+ } ) ;
106
+ expect ( otherContainer . textContent ) . toBe ( 'B' ) ;
107
+ expect ( calledA ) . toBe ( true ) ;
108
+ expect ( calledB ) . toBe ( true ) ;
128
109
} ) ;
129
110
130
111
it ( 'should not bail out when an update is scheduled from within an event handler' , ( ) => {
0 commit comments