Skip to content

Commit d921b24

Browse files
committed
chore: use versioned render in console test
1 parent 596827f commit d921b24

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

packages/react-devtools-shared/src/__tests__/console-test.js

+13-15
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
* @flow
88
*/
99

10-
import {normalizeCodeLocInfo} from './utils';
10+
import {getVersionedRenderImplementation, normalizeCodeLocInfo} from './utils';
1111

1212
let React;
1313
let ReactDOMClient;
1414
let act;
1515
let fakeConsole;
16-
let legacyRender;
1716
let mockError;
1817
let mockInfo;
1918
let mockGroup;
@@ -67,9 +66,10 @@ describe('console', () => {
6766

6867
const utils = require('./utils');
6968
act = utils.act;
70-
legacyRender = utils.legacyRender;
7169
});
7270

71+
const {render} = getVersionedRenderImplementation();
72+
7373
// @reactVersion >=18.0
7474
it('should not patch console methods that are not explicitly overridden', () => {
7575
expect(fakeConsole.error).not.toBe(mockError);
@@ -185,7 +185,7 @@ describe('console', () => {
185185
return null;
186186
};
187187

188-
act(() => legacyRender(<Child />, document.createElement('div')));
188+
act(() => render(<Child />));
189189

190190
expect(mockWarn).toHaveBeenCalledTimes(1);
191191
expect(mockWarn.mock.calls[0]).toHaveLength(1);
@@ -215,7 +215,7 @@ describe('console', () => {
215215
return null;
216216
};
217217

218-
act(() => legacyRender(<Parent />, document.createElement('div')));
218+
act(() => render(<Parent />));
219219

220220
expect(mockLog).toHaveBeenCalledTimes(1);
221221
expect(mockLog.mock.calls[0]).toHaveLength(1);
@@ -256,7 +256,7 @@ describe('console', () => {
256256
return null;
257257
};
258258

259-
act(() => legacyRender(<Parent />, document.createElement('div')));
259+
act(() => render(<Parent />));
260260

261261
expect(mockLog).toHaveBeenCalledTimes(2);
262262
expect(mockLog.mock.calls[0]).toHaveLength(1);
@@ -313,9 +313,8 @@ describe('console', () => {
313313
}
314314
}
315315

316-
const container = document.createElement('div');
317-
act(() => legacyRender(<Parent />, container));
318-
act(() => legacyRender(<Parent />, container));
316+
act(() => render(<Parent />));
317+
act(() => render(<Parent />));
319318

320319
expect(mockLog).toHaveBeenCalledTimes(2);
321320
expect(mockLog.mock.calls[0]).toHaveLength(1);
@@ -367,7 +366,7 @@ describe('console', () => {
367366
}
368367
}
369368

370-
act(() => legacyRender(<Parent />, document.createElement('div')));
369+
act(() => render(<Parent />));
371370

372371
expect(mockLog).toHaveBeenCalledTimes(1);
373372
expect(mockLog.mock.calls[0]).toHaveLength(1);
@@ -396,7 +395,7 @@ describe('console', () => {
396395
return null;
397396
};
398397

399-
act(() => legacyRender(<Child />, document.createElement('div')));
398+
act(() => render(<Child />));
400399

401400
expect(mockWarn).toHaveBeenCalledTimes(1);
402401
expect(mockWarn.mock.calls[0]).toHaveLength(1);
@@ -410,7 +409,7 @@ describe('console', () => {
410409
breakOnConsoleErrors: false,
411410
showInlineWarningsAndErrors: false,
412411
});
413-
act(() => legacyRender(<Child />, document.createElement('div')));
412+
act(() => render(<Child />));
414413

415414
expect(mockWarn).toHaveBeenCalledTimes(2);
416415
expect(mockWarn.mock.calls[1]).toHaveLength(2);
@@ -457,7 +456,7 @@ describe('console', () => {
457456
return null;
458457
};
459458

460-
act(() => legacyRender(<Parent />, document.createElement('div')));
459+
act(() => render(<Parent />));
461460

462461
expect(mockLog).toHaveBeenCalledTimes(1);
463462
expect(mockLog.mock.calls[0]).toHaveLength(1);
@@ -483,7 +482,7 @@ describe('console', () => {
483482
return null;
484483
};
485484

486-
act(() => legacyRender(<Component />, document.createElement('div')));
485+
act(() => render(<Component />));
487486

488487
expect(mockWarn).toHaveBeenCalledTimes(1);
489488
expect(mockWarn.mock.calls[0][0]).toBe('Symbol:');
@@ -824,7 +823,6 @@ describe('console error', () => {
824823

825824
const utils = require('./utils');
826825
act = utils.act;
827-
legacyRender = utils.legacyRender;
828826
});
829827

830828
// @reactVersion >=18.0

0 commit comments

Comments
 (0)