Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/renderers/dom/shared/__tests__/ReactMount-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,24 @@ describe('ReactMount', () => {
spyOn(console, 'error');
ReactDOM.render(<div />, container);
expectDev(console.error.calls.count()).toBe(1);
if (ReactDOMFeatureFlags.useFiber) {
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'Did not expect server HTML to contain the text node " " in <container>.',
);
} else {
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'Target node has markup rendered by React, but there are unrelated nodes as well.',
);
}

console.error.calls.reset();
ReactDOM.unmountComponentAtNode(container);

container.innerHTML = ' ' + ReactDOMServer.renderToString(<div />);

ReactDOM.render(<div />, container);
expectDev(console.error.calls.count()).toBe(2);
expectDev(console.error.calls.count()).toBe(1);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'Target node has markup rendered by React, but there are unrelated nodes as well.',
);
});

it('should not warn if mounting into non-empty node', () => {
Expand Down
12 changes: 12 additions & 0 deletions src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,18 @@ describe('ReactDOMServer', () => {
instance = ReactDOM.render(<TestComponent name="y" />, element);
expect(mountCount).toEqual(4);
expectDev(console.error.calls.count()).toBe(1);
if (ReactDOMFeatureFlags.useFiber) {
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'Text content did not match. Server: "x" Client: "y"',
);
} else {
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'(client) -- react-text: 3 -->y<!-- /react-text --',
);
expectDev(console.error.calls.argsFor(0)[0]).toContain(
'(server) -- react-text: 3 -->x<!-- /react-text --',
);
}
expect(element.innerHTML.length > 0).toBe(true);
expect(element.innerHTML).not.toEqual(lastMarkup);

Expand Down