Skip to content

Commit 2ab3810

Browse files
committed
Mark TestRendererAsync test as internal and revert changes to it
TestRenderer is built with strict mode doublerender off. We could change that but I'm not sure we want to. So I'll just flip the flag off for this test.
1 parent 0271278 commit 2ab3810

File tree

1 file changed

+29
-60
lines changed

1 file changed

+29
-60
lines changed

packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.js renamed to packages/react-test-renderer/src/__tests__/ReactTestRendererAsync-test.internal.js

Lines changed: 29 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@
1111
'use strict';
1212

1313
let React;
14+
let ReactFeatureFlags;
1415
let ReactTestRenderer;
1516

1617
describe('ReactTestRendererAsync', () => {
1718
beforeEach(() => {
1819
jest.resetModules();
20+
ReactFeatureFlags = require('shared/ReactFeatureFlags');
21+
ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false;
1922
React = require('react');
2023
ReactTestRenderer = require('react-test-renderer');
2124
});
@@ -62,19 +65,11 @@ describe('ReactTestRendererAsync', () => {
6265
unstable_isConcurrent: true,
6366
});
6467

65-
expect(renderer).toFlushAndYield(
66-
__DEV__
67-
? ['A:1', 'A:1', 'B:1', 'B:1', 'C:1', 'C:1']
68-
: ['A:1', 'B:1', 'C:1'],
69-
);
68+
expect(renderer).toFlushAndYield(['A:1', 'B:1', 'C:1']);
7069
expect(renderer.toJSON()).toEqual(['A:1', 'B:1', 'C:1']);
7170

7271
renderer.update(<Parent step={2} />);
73-
expect(renderer).toFlushAndYield(
74-
__DEV__
75-
? ['A:2', 'A:2', 'B:2', 'B:2', 'C:2', 'C:2']
76-
: ['A:2', 'B:2', 'C:2'],
77-
);
72+
expect(renderer).toFlushAndYield(['A:2', 'B:2', 'C:2']);
7873
expect(renderer.toJSON()).toEqual(['A:2', 'B:2', 'C:2']);
7974
});
8075

@@ -97,14 +92,12 @@ describe('ReactTestRendererAsync', () => {
9792
});
9893

9994
// Flush the first two siblings
100-
expect(renderer).toFlushAndYieldThrough(
101-
__DEV__ ? ['A:1', 'A:1', 'B:1', 'B:1'] : ['A:1', 'B:1'],
102-
);
95+
expect(renderer).toFlushAndYieldThrough(['A:1', 'B:1']);
10396
// Did not commit yet.
10497
expect(renderer.toJSON()).toEqual(null);
10598

10699
// Flush the remaining work
107-
expect(renderer).toFlushAndYield(__DEV__ ? ['C:1', 'C:1'] : ['C:1']);
100+
expect(renderer).toFlushAndYield(['C:1']);
108101
expect(renderer.toJSON()).toEqual(['A:1', 'B:1', 'C:1']);
109102
});
110103

@@ -136,7 +129,7 @@ describe('ReactTestRendererAsync', () => {
136129
});
137130

138131
// Flush the some of the changes, but don't commit
139-
expect(renderer).toFlushAndYieldThrough(__DEV__ ? ['A:1', 'A:1'] : ['A:1']);
132+
expect(renderer).toFlushAndYieldThrough(['A:1']);
140133
expect(renderer.toJSON()).toEqual(null);
141134

142135
// Interrupt with higher priority properties
@@ -232,54 +225,30 @@ describe('ReactTestRendererAsync', () => {
232225
});
233226

234227
expect(renderer).toFlushAndThrow('Oh no!');
235-
expect(ReactTestRenderer).toHaveYielded(
236-
__DEV__
237-
? [
238-
'A',
239-
'A',
240-
'B',
241-
'B',
242-
'C',
243-
'C',
244-
'D',
245-
'D',
246-
'A',
247-
'A',
248-
'B',
249-
'B',
250-
'C',
251-
'C',
252-
'D',
253-
'D',
254-
]
255-
: ['A', 'B', 'C', 'D', 'A', 'B', 'C', 'D'],
256-
);
228+
expect(ReactTestRenderer).toHaveYielded([
229+
'A',
230+
'B',
231+
'C',
232+
'D',
233+
'A',
234+
'B',
235+
'C',
236+
'D',
237+
]);
257238

258239
renderer.update(<App />);
259240

260241
expect(renderer).toFlushAndThrow('Oh no!');
261-
expect(ReactTestRenderer).toHaveYielded(
262-
__DEV__
263-
? [
264-
'A',
265-
'A',
266-
'B',
267-
'B',
268-
'C',
269-
'C',
270-
'D',
271-
'D',
272-
'A',
273-
'A',
274-
'B',
275-
'B',
276-
'C',
277-
'C',
278-
'D',
279-
'D',
280-
]
281-
: ['A', 'B', 'C', 'D', 'A', 'B', 'C', 'D'],
282-
);
242+
expect(ReactTestRenderer).toHaveYielded([
243+
'A',
244+
'B',
245+
'C',
246+
'D',
247+
'A',
248+
'B',
249+
'C',
250+
'D',
251+
]);
283252

284253
renderer.update(<App />);
285254
expect(renderer).toFlushAndThrow('Oh no!');
@@ -317,4 +286,4 @@ describe('ReactTestRendererAsync', () => {
317286
'Log of yielded values is not empty.',
318287
);
319288
});
320-
});
289+
});

0 commit comments

Comments
 (0)