Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add more SSR unit tests for elements and children. #9221

Merged
merged 4 commits into from
Mar 24, 2017
Merged

Add more SSR unit tests for elements and children. #9221

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
828cae1
Adding more SSR unit tests for elements and children.
aickin Mar 20, 2017
2781c49
Some of my SSR tests were testing for react-text and react-empty elem…
aickin Mar 20, 2017
091d7fd
Tweaked some test names after @gaearon review comment https://github.…
aickin Mar 21, 2017
0d389f8
Responding to code review https://github.com/facebook/react/pull/9221…
aickin Mar 24, 2017
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
42 changes: 14 additions & 28 deletions scripts/fiber/tests-failing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,47 +50,36 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
* renders a div with text with flanking whitespace with client render on top of good server markup
* renders a div with text with client render on top of good server markup
* renders a div with blank text child with client render on top of good server markup
* renders renders a div with blank text children with clean client render
* renders renders a div with blank text children with server string render
* renders renders a div with blank text children with client render on top of good server markup
* renders renders a div with blank text children with client render on top of bad server markup
* renders a div with whitespace children with clean client render
* renders a div with whitespace children with server string render
* renders a div with whitespace children with client render on top of good server markup
* renders a div with whitespace children with client render on top of bad server markup
* renders a div with text sibling to a node with clean client render
* renders a div with text sibling to a node with server string render
* renders a div with text sibling to a node with client render on top of good server markup
* renders a div with text sibling to a node with client render on top of bad server markup
* renders a non-standard element with text with client render on top of good server markup
* renders a custom element with text with client render on top of good server markup
* renders leading blank children with comments when there are multiple children with clean client render
* renders leading blank children with comments when there are multiple children with server string render
* renders leading blank children with comments when there are multiple children with client render on top of good server markup
* renders leading blank children with comments when there are multiple children with client render on top of bad server markup
* renders trailing blank children with comments when there are multiple children with clean client render
* renders trailing blank children with comments when there are multiple children with server string render
* renders trailing blank children with comments when there are multiple children with client render on top of good server markup
* renders trailing blank children with comments when there are multiple children with client render on top of bad server markup
* renders an element with just one text child without comments with client render on top of good server markup
* renders an element with two text children with comments with clean client render
* renders an element with two text children with comments with server string render
* renders an element with two text children with comments with client render on top of good server markup
* renders an element with two text children with comments with client render on top of bad server markup
* renders a number as single child with client render on top of good server markup
* renders zero as single child with client render on top of good server markup
* renders an element with number and text children with comments with clean client render
* renders an element with number and text children with comments with server string render
* renders an element with number and text children with comments with client render on top of good server markup
* renders an element with number and text children with comments with client render on top of bad server markup
* renders null single child as blank with client render on top of good server markup
* renders false single child as blank with client render on top of good server markup
* renders undefined single child as blank with client render on top of good server markup
* renders a null component children as empty with clean client render
* renders a null component children as empty with server string render
* renders a null component children as empty with client render on top of good server markup
* renders a null component children as empty with client render on top of bad server markup
* renders null children as blank with clean client render
* renders null children as blank with server string render
* renders null children as blank with client render on top of good server markup
* renders null children as blank with client render on top of bad server markup
* renders false children as blank with clean client render
* renders false children as blank with server string render
* renders false children as blank with client render on top of good server markup
* renders false children as blank with client render on top of bad server markup
* renders null and false children together as blank with clean client render
* renders null and false children together as blank with server string render
* renders null and false children together as blank with client render on top of good server markup
* renders null and false children together as blank with client render on top of bad server markup
* renders only null and false children as blank with client render on top of good server markup
* renders an svg element with client render on top of good server markup
* renders svg element with an xlink with client render on top of good server markup
Expand All @@ -109,16 +98,13 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
* renders multi-child hierarchies of components with client render on top of good server markup
* renders a div with a child with client render on top of good server markup
* renders a div with multiple children with client render on top of good server markup
* renders a div with multiple children separated by whitespace with clean client render
* renders a div with multiple children separated by whitespace with server string render
* renders a div with multiple children separated by whitespace with client render on top of good server markup
* renders a div with multiple children separated by whitespace with client render on top of bad server markup
* renders a div with a child surrounded by whitespace with clean client render
* renders a div with a child surrounded by whitespace with server string render
* renders a div with a child surrounded by whitespace with client render on top of good server markup
* renders a div with a child surrounded by whitespace with client render on top of bad server markup
* renders >,<, and & as single child with client render on top of good server markup
* renders >,<, and & as multiple children with clean client render
* renders >,<, and & as multiple children with server string render
* renders >,<, and & as multiple children with client render on top of good server markup
* renders >,<, and & as multiple children with client render on top of bad server markup

src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js
* can reconcile text merged by Node.normalize() alongside other elements
Expand Down
14 changes: 14 additions & 0 deletions scripts/fiber/tests-passing-except-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,25 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
* renders a div with text with flanking whitespace with client render on top of bad server markup
* renders a div with text with client render on top of bad server markup
* renders a div with blank text child with client render on top of bad server markup
* renders renders a div with blank text children with client render on top of bad server markup
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renders renders

Copy link
Contributor Author

@aickin aickin Mar 21, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! I fixed that in 091d7fd and made some of the other names more descriptive. Thanks for the help!

* renders a div with whitespace children with client render on top of bad server markup
* renders a div with text sibling to a node with client render on top of bad server markup
* renders a non-standard element with text with client render on top of bad server markup
* renders a custom element with text with client render on top of bad server markup
* renders leading blank children with comments when there are multiple children with client render on top of bad server markup
* renders trailing blank children with comments when there are multiple children with client render on top of bad server markup
* renders an element with just one text child without comments with client render on top of bad server markup
* renders an element with two text children with comments with client render on top of bad server markup
* renders a number as single child with client render on top of bad server markup
* renders zero as single child with client render on top of bad server markup
* renders an element with number and text children with comments with client render on top of bad server markup
* renders null single child as blank with client render on top of bad server markup
* renders false single child as blank with client render on top of bad server markup
* renders undefined single child as blank with client render on top of bad server markup
* renders a null component children as empty with client render on top of bad server markup
* renders null children as blank with client render on top of bad server markup
* renders false children as blank with client render on top of bad server markup
* renders null and false children together as blank with client render on top of bad server markup
* renders only null and false children as blank with client render on top of bad server markup
* renders an svg element with client render on top of bad server markup
* renders svg element with an xlink with client render on top of bad server markup
Expand All @@ -77,7 +88,10 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
* renders multi-child hierarchies of components with client render on top of bad server markup
* renders a div with a child with client render on top of bad server markup
* renders a div with multiple children with client render on top of bad server markup
* renders a div with multiple children separated by whitespace with client render on top of bad server markup
* renders a div with a child surrounded by whitespace with client render on top of bad server markup
* renders >,<, and & as single child with client render on top of bad server markup
* renders >,<, and & as multiple children with client render on top of bad server markup
* throws when rendering a string component with clean client render
* throws when rendering a string component with client render on top of bad server markup
* throws when rendering an undefined component with clean client render
Expand Down
28 changes: 14 additions & 14 deletions scripts/fiber/tests-passing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,33 +1146,33 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
* renders a div with text with clean client render
* renders a div with blank text child with server string render
* renders a div with blank text child with clean client render
* renders renders a div with blank text children with server string render
* renders a div with whitespace children with server string render
* renders a div with text sibling to a node with server string render
* renders renders a div with blank text children with clean client render
* renders a div with whitespace children with clean client render
* renders a div with text sibling to a node with clean client render
* renders a non-standard element with text with server string render
* renders a non-standard element with text with clean client render
* renders a custom element with text with server string render
* renders a custom element with text with clean client render
* renders leading blank children with comments when there are multiple children with server string render
* renders trailing blank children with comments when there are multiple children with server string render
* renders leading blank children with comments when there are multiple children with clean client render
* renders trailing blank children with comments when there are multiple children with clean client render
* renders an element with just one text child without comments with server string render
* renders an element with just one text child without comments with clean client render
* renders an element with two text children with comments with server string render
* renders an element with two text children with comments with clean client render
* renders a number as single child with server string render
* renders a number as single child with clean client render
* renders zero as single child with server string render
* renders zero as single child with clean client render
* renders an element with number and text children with comments with server string render
* renders an element with number and text children with comments with clean client render
* renders null single child as blank with server string render
* renders null single child as blank with clean client render
* renders false single child as blank with server string render
* renders false single child as blank with clean client render
* renders undefined single child as blank with server string render
* renders undefined single child as blank with clean client render
* renders a null component children as empty with server string render
* renders null children as blank with server string render
* renders false children as blank with server string render
* renders null and false children together as blank with server string render
* renders a null component children as empty with clean client render
* renders null children as blank with clean client render
* renders false children as blank with clean client render
* renders null and false children together as blank with clean client render
* renders only null and false children as blank with server string render
* renders only null and false children as blank with clean client render
* renders an svg element with server string render
Expand Down Expand Up @@ -1209,11 +1209,11 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
* renders a div with a child with clean client render
* renders a div with multiple children with server string render
* renders a div with multiple children with clean client render
* renders a div with multiple children separated by whitespace with server string render
* renders a div with a child surrounded by whitespace with server string render
* renders a div with multiple children separated by whitespace with clean client render
* renders a div with a child surrounded by whitespace with clean client render
* renders >,<, and & as single child with server string render
* renders >,<, and & as single child with clean client render
* renders >,<, and & as multiple children with server string render
* renders >,<, and & as multiple children with clean client render
* throws when rendering a string component with server string render
* throws when rendering an undefined component with server string render
* throws when rendering a number component with server string render
Expand Down
Loading