{"patch":"diff --git a\/packages\/react-test-renderer\/src\/ReactTestRenderer.js b\/packages\/react-test-renderer\/src\/ReactTestRenderer.js\nindex 3fff46d818..711f8f6a5e 100644\n--- a\/packages\/react-test-renderer\/src\/ReactTestRenderer.js\n+++ b\/packages\/react-test-renderer\/src\/ReactTestRenderer.js\n@@ -200,8 +200,45 @@ const validWrapperTypes = new Set([\n ClassComponent,\n HostComponent,\n ForwardRef,\n+ \/\/ Normally skipped, but used when there's more than one root child.\n+ HostRoot,\n ]);\n \n+function getChildren(parent: Fiber) {\n+ const children = [];\n+ const startingNode = parent;\n+ let node: Fiber = startingNode;\n+ if (node.child === null) {\n+ return children;\n+ }\n+ node.child.return = node;\n+ node = node.child;\n+ outer: while (true) {\n+ let descend = false;\n+ if (validWrapperTypes.has(node.tag)) {\n+ children.push(wrapFiber(node));\n+ } else if (node.tag === HostText) {\n+ children.push('' + node.memoizedProps);\n+ } else {\n+ descend = true;\n+ }\n+ if (descend && node.child !== null) {\n+ node.child.return = node;\n+ node = node.child;\n+ continue;\n+ }\n+ while (node.sibling === null) {\n+ if (node.return === startingNode) {\n+ break outer;\n+ }\n+ node = (node.return: any);\n+ }\n+ (node.sibling: any).return = node.return;\n+ node = (node.sibling: any);\n+ }\n+ return children;\n+}\n+\n class ReactTestInstance {\n _fiber: Fiber;\n \n@@ -246,6 +283,13 @@ class ReactTestInstance {\n let parent = this._fiber.return;\n while (parent !== null) {\n if (validWrapperTypes.has(parent.tag)) {\n+ if (parent.tag === HostRoot) {\n+ \/\/ Special case: we only \"materialize\" instances for roots\n+ \/\/ if they have more than a single child. So we'll check that now.\n+ if (getChildren(parent).length < 2) {\n+ return null;\n+ }\n+ }\n return wrapFiber(parent);\n }\n parent = parent.return;\n@@ -254,38 +298,7 @@ class ReactTestInstance {\n }\n \n get children(): Array {\n- const children = [];\n- const startingNode = this._currentFiber();\n- let node: Fiber = startingNode;\n- if (node.child === null) {\n- return children;\n- }\n- node.child.return = node;\n- node = node.child;\n- outer: while (true) {\n- let descend = false;\n- if (validWrapperTypes.has(node.tag)) {\n- children.push(wrapFiber(node));\n- } else if (node.tag === HostText) {\n- children.push('' + node.memoizedProps);\n- } else {\n- descend = true;\n- }\n- if (descend && node.child !== null) {\n- node.child.return = node;\n- node = node.child;\n- continue;\n- }\n- while (node.sibling === null) {\n- if (node.return === startingNode) {\n- break outer;\n- }\n- node = (node.return: any);\n- }\n- (node.sibling: any).return = node.return;\n- node = (node.sibling: any);\n- }\n- return children;\n+ return getChildren(this._currentFiber());\n }\n \n \/\/ Custom search functions\n@@ -469,10 +482,20 @@ const ReactTestRendererFiber = {\n configurable: true,\n enumerable: true,\n get: function() {\n- if (root === null || root.current.child === null) {\n+ if (root === null) {\n+ throw new Error(\"Can't access .root on unmounted test renderer\");\n+ }\n+ const children = getChildren(root.current);\n+ if (children.length === 0) {\n throw new Error(\"Can't access .root on unmounted test renderer\");\n+ } else if (children.length === 1) {\n+ \/\/ Normally, we skip the root and just give you the child.\n+ return children[0];\n+ } else {\n+ \/\/ However, we give you the root if there's more than one root child.\n+ \/\/ We could make this the behavior for all cases but it would be a breaking change.\n+ return wrapFiber(root.current);\n }\n- return wrapFiber(root.current.child);\n },\n }: Object),\n );\ndiff --git a\/packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererTraversal-test.js b\/packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererTraversal-test.js\nindex 9fb91e1f35..3ea71880ea 100644\n--- a\/packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererTraversal-test.js\n+++ b\/packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererTraversal-test.js\n@@ -199,4 +199,48 @@ describe('ReactTestRendererTraversal', () => {\n expect(nestedViews[1].parent).toBe(expectedParent);\n expect(nestedViews[2].parent).toBe(expectedParent);\n });\n+\n+ it('can have special nodes as roots', () => {\n+ const FR = React.forwardRef(props =>

);\n+ expect(\n+ ReactTestRenderer.create(\n+ \n+

\n+

\n+ <\/FR>,\n+ ).root.findAllByType('div').length,\n+ ).toBe(2);\n+ expect(\n+ ReactTestRenderer.create(\n+ \n+

\n+

\n+ <\/React.Fragment>,\n+ ).root.findAllByType('div').length,\n+ ).toBe(2);\n+ expect(\n+ ReactTestRenderer.create(\n+ \n+

\n+

\n+ <\/React.Fragment>,\n+ ).root.findAllByType('div').length,\n+ ).toBe(2);\n+ expect(\n+ ReactTestRenderer.create(\n+ \n+

\n+

\n+ <\/React.StrictMode>,\n+ ).root.findAllByType('div').length,\n+ ).toBe(2);\n+ expect(\n+ ReactTestRenderer.create(\n+ \n+

\n+

\n+ <\/Context.Provider>,\n+ ).root.findAllByType('div').length,\n+ ).toBe(2);\n+ });\n });\n","files":[{"path":"packages\/react-test-renderer\/src\/ReactTestRenderer.js","status":"M"},{"path":"packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererTraversal-test.js","status":"M"}],"parents":["d480782c4162431d06c077ebf8fdf6b8ba7896ef"],"body":"","commit":{"authorEmail":"dan.abramov@gmail.com","revision":"30bc8ef79295c71f5a4fc459c5bbd4b271f6f390","authoredAt":"2018-06-11T20:03:51+01:00","subject":"Allow multiple root children in test renderer traversal API (#13017)","shortRevision":"30bc8ef792","authorName":"Dan Abramov"}}

dillon1000/react

Files changed