Use renderToStaticMarkup for tests (#16516)

devknoll · trueadm · commit f61138e0681f · 2019-08-29T16:08:38.000+01:00
diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js
@@ -320,7 +320,7 @@ describe('ReactDOMServer', () => {
 return <div>{this.state.text}</div>;
 }
 }
- const markup = ReactDOMServer.renderToString(<Component />);
+ const markup = ReactDOMServer.renderToStaticMarkup(<Component />);
 expect(markup).toContain('hello, world');
 });
 
@@ -339,7 +339,7 @@ describe('ReactDOMServer', () => {
 return <div>{this.state.text}</div>;
 }
 }
- const markup = ReactDOMServer.renderToString(<Component />);
+ const markup = ReactDOMServer.renderToStaticMarkup(<Component />);
 expect(markup).toContain('hello, world');
 });
 
@@ -354,7 +354,7 @@ describe('ReactDOMServer', () => {
 }
 }
 
- const markup = ReactDOMServer.renderToString(
+ const markup = ReactDOMServer.renderToStaticMarkup(
 <Component text="hello, world" />,
 );
 expect(markup).toContain('hello, world');
@@ -391,7 +391,7 @@ describe('ReactDOMServer', () => {
 text: PropTypes.string,
 };
 
- const markup = ReactDOMServer.renderToString(
+ const markup = ReactDOMServer.renderToStaticMarkup(
 <ContextProvider>
 <Component />
 </ContextProvider>,
@@ -429,7 +429,7 @@ describe('ReactDOMServer', () => {
 );
 }
 
- const markup = ReactDOMServer.renderToString(<App value={1} />);
+ const markup = ReactDOMServer.renderToStaticMarkup(<App value={1} />);
 // Extract the numbers rendered by the consumers
 const results = markup.match(/\d+/g).map(Number);
 expect(results).toEqual([2, 1, 3, 1]);
@@ -467,7 +467,7 @@ describe('ReactDOMServer', () => {
 );
 }
 
- const markup = ReactDOMServer.renderToString(<App value={1} />);
+ const markup = ReactDOMServer.renderToStaticMarkup(<App value={1} />);
 // Extract the numbers rendered by the consumers
 const results = markup.match(/\d+/g).map(Number);
 expect(results).toEqual([2, 1, 3, 1]);
@@ -484,7 +484,7 @@ describe('ReactDOMServer', () => {
 
 let reentrantMarkup;
 function Reentrant() {
- reentrantMarkup = ReactDOMServer.renderToString(
+ reentrantMarkup = ReactDOMServer.renderToStaticMarkup(
 <App value={1} reentrant={false} />,
 );
 return null;
@@ -512,7 +512,7 @@ describe('ReactDOMServer', () => {
 );
 }
 
- const markup = ReactDOMServer.renderToString(
+ const markup = ReactDOMServer.renderToStaticMarkup(
 <App value={1} reentrant={true} />,
 );
 // Extract the numbers rendered by the consumers
@@ -566,7 +566,7 @@ describe('ReactDOMServer', () => {
 },
 }));
 
- expect(ReactDOMServer.renderToString(<LazyFoo id="foo" />)).toEqual(
+ expect(ReactDOMServer.renderToStaticMarkup(<LazyFoo id="foo" />)).toEqual(
 '<div id="foo">lazy</div>',
 );
 });
@@ -578,7 +578,7 @@ describe('ReactDOMServer', () => {
 },
 }));
 
- expect(() => ReactDOMServer.renderToString(<LazyFoo />)).toThrow(
+ expect(() => ReactDOMServer.renderToStaticMarkup(<LazyFoo />)).toThrow(
 'Bad lazy',
 );
 });

-Original file line number
+Diff line change
 return<div>{this.state.text}</div>;
+}
+}
 -constmarkup=ReactDOMServer.renderToString(<Component/>);
 +constmarkup=ReactDOMServer.renderToStaticMarkup(<Component/>);
 expect(markup).toContain('hello, world');
 });
 return<div>{this.state.text}</div>;
+}
+}
 -constmarkup=ReactDOMServer.renderToString(<Component/>);
 +constmarkup=ReactDOMServer.renderToStaticMarkup(<Component/>);
 expect(markup).toContain('hello, world');
 });
+}
+}
 -constmarkup=ReactDOMServer.renderToString(
 +constmarkup=ReactDOMServer.renderToStaticMarkup(
 <Componenttext="hello, world"/>,
 );
 expect(markup).toContain('hello, world');
 text: PropTypes.string,
 };
 -constmarkup=ReactDOMServer.renderToString(
 +constmarkup=ReactDOMServer.renderToStaticMarkup(
 <ContextProvider>
 <Component/>
 </ContextProvider>,
 );
+}
 -constmarkup=ReactDOMServer.renderToString(<Appvalue={1}/>);
 +constmarkup=ReactDOMServer.renderToStaticMarkup(<Appvalue={1}/>);
 // Extract the numbers rendered by the consumers
 constresults=markup.match(/\d+/g).map(Number);
 expect(results).toEqual([2,1,3,1]);
 );
+}
 -constmarkup=ReactDOMServer.renderToString(<Appvalue={1}/>);
 +constmarkup=ReactDOMServer.renderToStaticMarkup(<Appvalue={1}/>);
 // Extract the numbers rendered by the consumers
 constresults=markup.match(/\d+/g).map(Number);
 expect(results).toEqual([2,1,3,1]);
 letreentrantMarkup;
 functionReentrant(){
 -reentrantMarkup=ReactDOMServer.renderToString(
 +reentrantMarkup=ReactDOMServer.renderToStaticMarkup(
 <Appvalue={1}reentrant={false}/>,
 );
 returnnull;
 );
+}
 -constmarkup=ReactDOMServer.renderToString(
 +constmarkup=ReactDOMServer.renderToStaticMarkup(
 <Appvalue={1}reentrant={true}/>,
 );
 // Extract the numbers rendered by the consumers
 },
 }));
 -expect(ReactDOMServer.renderToString(<LazyFooid="foo"/>)).toEqual(
 +expect(ReactDOMServer.renderToStaticMarkup(<LazyFooid="foo"/>)).toEqual(
 '<div id="foo">lazy</div>',
 );
 });
 },
 }));
 -expect(()=>ReactDOMServer.renderToString(<LazyFoo/>)).toThrow(
 +expect(()=>ReactDOMServer.renderToStaticMarkup(<LazyFoo/>)).toThrow(
 'Bad lazy',
 );
 });