Remove RTR from StrictEffectsMode-test (#28387)
## Summary Cleaning up internal usage of ReactTestRenderer ## How did you test this change? `yarn test packages/react-reconciler/src/__tests__/StrictEffectsMode-test.js`
Jack Pope committed
Feb 21, 2024 at 15:17 UTC
59fe6c3ac1d52e4e568be52b908905b8898a4777
1 file changed
+51
-71
packages/react-reconciler/src/__tests__/StrictEffectsMode-test.js
+51
-71
@@ -10,7 +10,7 @@
10
'use strict';
11
12
let React;
13
-let ReactTestRenderer;
13
+let ReactNoop;
14
let Scheduler;
15
let act;
16
let assertLog;
@@ -18,13 +18,13 @@ let assertLog;
18
describe('StrictEffectsMode', () => {
19
beforeEach(() => {
20
jest.resetModules();
21
- React = require('react');
22
- ReactTestRenderer = require('react-test-renderer');
23
- Scheduler = require('scheduler');
21
act = require('internal-test-utils').act;
25
-
22
const InternalTestUtils = require('internal-test-utils');
23
assertLog = InternalTestUtils.assertLog;
24
+
25
+ React = require('react');
26
+ Scheduler = require('scheduler');
27
+ ReactNoop = require('react-noop-renderer');
28
});
29
30
it('should not double invoke effects in legacy mode', async () => {
@@ -42,8 +42,9 @@ describe('StrictEffectsMode', () => {
42
return text;
43
}
44
45
+ const root = ReactNoop.createLegacyRoot();
46
await act(() => {
46
- ReactTestRenderer.create(
47
+ root.render(
48
<React.StrictMode>
49
<App text={'mount'} />
50
</React.StrictMode>,
@@ -68,15 +69,12 @@ describe('StrictEffectsMode', () => {
69
return text;
70
}
71
71
- let renderer;
72
await act(() => {
73
- renderer = ReactTestRenderer.create(
73
+ ReactNoop.renderToRootWithID(
74
<React.StrictMode>
75
<App text={'mount'} />
76
</React.StrictMode>,
77
- {
78
- isConcurrent: true,
79
- },
77
+ 'root',
78
);
79
});
80
@@ -94,10 +92,11 @@ describe('StrictEffectsMode', () => {
92
}
93
94
await act(() => {
97
- renderer.update(
95
+ ReactNoop.renderToRootWithID(
96
<React.StrictMode>
97
<App text={'update'} />
98
</React.StrictMode>,
99
+ 'root',
100
);
101
});
102
@@ -109,7 +108,7 @@ describe('StrictEffectsMode', () => {
108
]);
109
110
await act(() => {
112
- renderer.unmount();
111
+ ReactNoop.unmountRootWithID('root');
112
});
113
114
assertLog(['useLayoutEffect unmount', 'useEffect unmount']);
@@ -130,15 +129,12 @@ describe('StrictEffectsMode', () => {
129
return text;
130
}
131
133
- let renderer;
132
await act(() => {
135
- renderer = ReactTestRenderer.create(
133
+ ReactNoop.renderToRootWithID(
134
<React.StrictMode>
135
<App text={'mount'} />
136
</React.StrictMode>,
139
- {
140
- isConcurrent: true,
141
- },
137
+ 'root',
138
);
139
});
140
@@ -156,10 +152,11 @@ describe('StrictEffectsMode', () => {
152
}
153
154
await act(() => {
159
- renderer.update(
155
+ ReactNoop.renderToRootWithID(
156
<React.StrictMode>
157
<App text={'update'} />
158
</React.StrictMode>,
159
+ 'root',
160
);
161
});
162
@@ -171,7 +168,7 @@ describe('StrictEffectsMode', () => {
168
]);
169
170
await act(() => {
174
- renderer.unmount(null);
171
+ ReactNoop.unmountRootWithID('root');
172
});
173
174
assertLog(['useEffect One unmount', 'useEffect Two unmount']);
@@ -192,15 +189,12 @@ describe('StrictEffectsMode', () => {
189
return text;
190
}
191
195
- let renderer;
192
await act(() => {
197
- renderer = ReactTestRenderer.create(
193
+ ReactNoop.renderToRootWithID(
194
<React.StrictMode>
195
<App text={'mount'} />
196
</React.StrictMode>,
201
- {
202
- isConcurrent: true,
203
- },
197
+ 'root',
198
);
199
});
200
@@ -218,10 +212,11 @@ describe('StrictEffectsMode', () => {
212
}
213
214
await act(() => {
221
- renderer.update(
215
+ ReactNoop.renderToRootWithID(
216
<React.StrictMode>
217
<App text={'update'} />
218
</React.StrictMode>,
219
+ 'root',
220
);
221
});
222
@@ -233,7 +228,7 @@ describe('StrictEffectsMode', () => {
228
]);
229
230
await act(() => {
236
- renderer.unmount();
231
+ ReactNoop.unmountRootWithID('root');
232
});
233
234
assertLog(['useLayoutEffect One unmount', 'useLayoutEffect Two unmount']);
@@ -252,15 +247,11 @@ describe('StrictEffectsMode', () => {
247
return text;
248
}
249
255
- let renderer;
250
await act(() => {
257
- renderer = ReactTestRenderer.create(
251
+ ReactNoop.renderToRootWithID(
252
<React.StrictMode>
253
<App text={'mount'} />
254
</React.StrictMode>,
261
- {
262
- isConcurrent: true,
263
- },
255
);
256
});
257
@@ -276,7 +267,7 @@ describe('StrictEffectsMode', () => {
267
}
268
269
await act(() => {
279
- renderer.update(
270
+ ReactNoop.renderToRootWithID(
271
<React.StrictMode>
272
<App text={'update'} />
273
</React.StrictMode>,
@@ -286,7 +277,7 @@ describe('StrictEffectsMode', () => {
277
assertLog(['useLayoutEffect mount', 'useEffect mount']);
278
279
await act(() => {
289
- renderer.unmount();
280
+ ReactNoop.unmountRootWithID('root');
281
});
282
283
assertLog([]);
@@ -317,11 +308,10 @@ describe('StrictEffectsMode', () => {
308
}
309
310
await act(() => {
320
- ReactTestRenderer.create(
311
+ ReactNoop.renderToRootWithID(
312
<React.StrictMode>
313
<App />
314
</React.StrictMode>,
324
- {isConcurrent: true},
315
);
316
});
317
@@ -355,15 +345,12 @@ describe('StrictEffectsMode', () => {
345
}
346
}
347
358
- let renderer;
348
await act(() => {
360
- renderer = ReactTestRenderer.create(
349
+ ReactNoop.renderToRootWithID(
350
<React.StrictMode>
351
<App text={'mount'} />
352
</React.StrictMode>,
364
- {
365
- isConcurrent: true,
366
- },
353
+ 'root',
354
);
355
});
356
@@ -378,17 +365,18 @@ describe('StrictEffectsMode', () => {
365
}
366
367
await act(() => {
381
- renderer.update(
368
+ ReactNoop.renderToRootWithID(
369
<React.StrictMode>
370
<App text={'update'} />
371
</React.StrictMode>,
372
+ 'root',
373
);
374
});
375
376
assertLog(['componentDidUpdate']);
377
378
await act(() => {
391
- renderer.unmount();
379
+ ReactNoop.unmountRootWithID('root');
380
});
381
382
assertLog(['componentWillUnmount']);
@@ -409,15 +397,12 @@ describe('StrictEffectsMode', () => {
397
}
398
}
399
412
- let renderer;
400
await act(() => {
414
- renderer = ReactTestRenderer.create(
401
+ ReactNoop.renderToRootWithID(
402
<React.StrictMode>
403
<App text={'mount'} />
404
</React.StrictMode>,
418
- {
419
- isConcurrent: true,
420
- },
405
+ 'root',
406
);
407
});
408
@@ -428,17 +413,18 @@ describe('StrictEffectsMode', () => {
413
}
414
415
await act(() => {
431
- renderer.update(
416
+ ReactNoop.renderToRootWithID(
417
<React.StrictMode>
418
<App text={'update'} />
419
</React.StrictMode>,
420
+ 'root',
421
);
422
});
423
424
assertLog(['componentDidUpdate']);
425
426
await act(() => {
441
- renderer.unmount();
427
+ ReactNoop.unmountRootWithID('root');
428
});
429
430
assertLog(['componentWillUnmount']);
@@ -463,8 +449,9 @@ describe('StrictEffectsMode', () => {
449
}
450
}
451
452
+ const root = ReactNoop.createLegacyRoot();
453
await act(() => {
467
- ReactTestRenderer.create(
454
+ root.render(
455
<React.StrictMode>
456
<App text={'mount'} />
457
</React.StrictMode>,
@@ -495,13 +482,10 @@ describe('StrictEffectsMode', () => {
482
}
483
484
await act(() => {
498
- ReactTestRenderer.create(
485
+ ReactNoop.renderToRootWithID(
486
<React.StrictMode>
487
<App text={'mount'} />
488
</React.StrictMode>,
502
- {
503
- isConcurrent: true,
504
- },
489
);
490
});
491
@@ -565,11 +549,11 @@ describe('StrictEffectsMode', () => {
549
}
550
551
await act(() => {
568
- ReactTestRenderer.create(
552
+ ReactNoop.renderToRootWithID(
553
<React.StrictMode>
554
<App />
555
</React.StrictMode>,
572
- {isConcurrent: true},
556
+ 'root',
557
);
558
});
559
@@ -651,15 +635,12 @@ describe('StrictEffectsMode', () => {
635
);
636
}
637
654
- let renderer;
638
await act(() => {
656
- renderer = ReactTestRenderer.create(
639
+ ReactNoop.renderToRootWithID(
640
<React.StrictMode>
641
<App text={'mount'} />
642
</React.StrictMode>,
660
- {
661
- isConcurrent: true,
662
- },
643
+ 'root',
644
);
645
});
646
@@ -684,10 +665,11 @@ describe('StrictEffectsMode', () => {
665
}
666
667
await act(() => {
687
- renderer.update(
668
+ ReactNoop.renderToRootWithID(
669
<React.StrictMode>
670
<App text={'mount'} />
671
</React.StrictMode>,
672
+ 'root',
673
);
674
});
675
@@ -699,7 +681,7 @@ describe('StrictEffectsMode', () => {
681
]);
682
683
await act(() => {
702
- renderer.unmount();
684
+ ReactNoop.unmountRootWithID('root');
685
});
686
687
assertLog([
@@ -741,15 +723,12 @@ describe('StrictEffectsMode', () => {
723
);
724
}
725
744
- let renderer;
726
await act(() => {
746
- renderer = ReactTestRenderer.create(
727
+ ReactNoop.renderToRootWithID(
728
<React.StrictMode>
729
<App text={'mount'} />
730
</React.StrictMode>,
750
- {
751
- isConcurrent: true,
752
- },
731
+ 'root',
732
);
733
});
734
@@ -768,10 +747,11 @@ describe('StrictEffectsMode', () => {
747
}
748
749
await act(() => {
771
- renderer.update(
750
+ ReactNoop.renderToRootWithID(
751
<React.StrictMode>
752
<App text={'mount'} />
753
</React.StrictMode>,
754
+ 'root',
755
);
756
});
757
@@ -783,7 +763,7 @@ describe('StrictEffectsMode', () => {
763
]);
764
765
await act(() => {
786
- renderer.unmount();
766
+ ReactNoop.unmountRootWithID('root');
767
});
768
769
assertLog([