@@ -16,19 +16,21 @@ const TEXT_NODE_TYPE = 3;
1616
1717let React ;
1818let ReactDOM ;
19+ let ReactDOMClient ;
1920let ReactDOMServer ;
2021let ReactTestUtils ;
2122
2223function initModules ( ) {
2324 jest . resetModules ( ) ;
2425 React = require ( 'react' ) ;
2526 ReactDOM = require ( 'react-dom' ) ;
27+ ReactDOMClient = require ( 'react-dom/client' ) ;
2628 ReactDOMServer = require ( 'react-dom/server' ) ;
2729 ReactTestUtils = require ( 'react-dom/test-utils' ) ;
2830
2931 // Make them available to the helpers.
3032 return {
31- ReactDOM ,
33+ ReactDOMClient ,
3234 ReactDOMServer,
3335 ReactTestUtils,
3436 } ;
@@ -136,7 +138,13 @@ describe('ReactDOMServerIntegration', () => {
136138 // DOM nodes on the client side. We force it to fire early
137139 // so that it gets deduplicated later, and doesn't fail the test.
138140 expect ( ( ) => {
139- ReactDOM . render ( < nonstandard /> , document . createElement ( 'div' ) ) ;
141+ ReactDOM . flushSync ( ( ) => {
142+ const root = ReactDOMClient . createRoot (
143+ document . createElement ( 'div' ) ,
144+ ) ;
145+
146+ root . render ( < nonstandard /> ) ;
147+ } ) ;
140148 } ) . toErrorDev ( 'The tag <nonstandard> is unrecognized in this browser.' ) ;
141149
142150 const e = await render ( < nonstandard > Text</ nonstandard > ) ;
@@ -842,6 +850,8 @@ describe('ReactDOMServerIntegration', () => {
842850 expect ( e . childNodes . length ) . toBe ( 1 ) ;
843851 // Client rendering (or hydration) uses JS value with CR.
844852 // Null character stays.
853+
854+ //TODO: fixme - This is broken
845855 expectNode (
846856 e . childNodes [ 0 ] ,
847857 TEXT_NODE_TYPE ,
@@ -871,6 +881,8 @@ describe('ReactDOMServerIntegration', () => {
871881 // We have three nodes because there is a comment between them.
872882 expect ( e . childNodes . length ) . toBe ( 3 ) ;
873883 // Hydration uses JS value with CR and null character.
884+
885+ //TODO: fixme - This is broken
874886 expectNode ( e . childNodes [ 0 ] , TEXT_NODE_TYPE , 'foo\rbar' ) ;
875887 expectNode ( e . childNodes [ 2 ] , TEXT_NODE_TYPE , '\r\nbaz\nqux\u0000' ) ;
876888 } else {
0 commit comments