{"patch":"diff --git a\/packages\/react-test-renderer\/src\/ReactTestRenderer.js b\/packages\/react-test-renderer\/src\/ReactTestRenderer.js\nindex 5fab9af606..029c260580 100644\n--- a\/packages\/react-test-renderer\/src\/ReactTestRenderer.js\n+++ b\/packages\/react-test-renderer\/src\/ReactTestRenderer.js\n@@ -245,10 +245,14 @@ class ReactTestInstance {\n }\n \n get parent(): ?ReactTestInstance {\n- const parent = this._fiber.return;\n- return parent === null || parent.tag === HostRoot\n- ? null\n- : wrapFiber(parent);\n+ let parent = this._fiber.return;\n+ while (parent !== null) {\n+ if (validWrapperTypes.has(parent.tag)) {\n+ return wrapFiber(parent);\n+ }\n+ parent = parent.return;\n+ }\n+ return null;\n }\n \n get children(): Array {\n@@ -262,30 +266,12 @@ class ReactTestInstance {\n node = node.child;\n outer: while (true) {\n let descend = false;\n- switch (node.tag) {\n- case FunctionalComponent:\n- case ClassComponent:\n- case HostComponent:\n- case ForwardRef:\n- children.push(wrapFiber(node));\n- break;\n- case HostText:\n- children.push('' + node.memoizedProps);\n- break;\n- case Fragment:\n- case ContextProvider:\n- case ContextConsumer:\n- case Mode:\n- case Profiler:\n- descend = true;\n- break;\n- default:\n- invariant(\n- false,\n- 'Unsupported component type %s in test renderer. ' +\n- 'This is probably a bug in React.',\n- node.tag,\n- );\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;\ndiff --git a\/packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererTraversal-test.js b\/packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererTraversal-test.js\nindex cefef5657c..9fb91e1f35 100644\n--- a\/packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererTraversal-test.js\n+++ b\/packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererTraversal-test.js\n@@ -12,6 +12,7 @@\n \n const React = require('react');\n let ReactTestRenderer;\n+let Context;\n \n const RCTView = 'RCTView';\n const View = props => ;\n@@ -20,6 +21,7 @@ describe('ReactTestRendererTraversal', () => {\n beforeEach(() => {\n jest.resetModules();\n ReactTestRenderer = require('react-test-renderer');\n+ Context = React.createContext(null);\n });\n \n class Example extends React.Component {\n@@ -40,6 +42,17 @@ describe('ReactTestRendererTraversal', () => {\n {}}>\n \n <\/React.unstable_Profiler>\n+ \n+ \n+ \n+ \n+ {() => }\n+ <\/Context.Consumer>\n+ <\/Context.Provider>\n+ <\/React.Fragment>\n+ \n+ \n+ <\/React.Fragment>\n <\/View>\n <\/View>\n );\n@@ -61,7 +74,7 @@ describe('ReactTestRendererTraversal', () => {\n \n \/\/ assert .props, .type and .parent attributes\n const foo = render.root.find(hasFooProp);\n- expect(foo.props.children).toHaveLength(8);\n+ expect(foo.props.children).toHaveLength(9);\n expect(foo.type).toBe(View);\n expect(render.root.parent).toBe(null);\n expect(foo.children[0].parent).toBe(foo);\n@@ -76,6 +89,7 @@ describe('ReactTestRendererTraversal', () => {\n const hasNullProp = node => node.props.hasOwnProperty('null');\n const hasVoidProp = node => node.props.hasOwnProperty('void');\n const hasItselfProp = node => node.props.hasOwnProperty('itself');\n+ const hasNestedProp = node => node.props.hasOwnProperty('nested');\n \n expect(() => render.root.find(hasFooProp)).not.toThrow(); \/\/ 1 match\n expect(() => render.root.find(hasBarProp)).toThrow(); \/\/ >1 matches\n@@ -83,6 +97,7 @@ describe('ReactTestRendererTraversal', () => {\n expect(() => render.root.find(hasBingProp)).not.toThrow(); \/\/ 1 match\n expect(() => render.root.find(hasNullProp)).not.toThrow(); \/\/ 1 match\n expect(() => render.root.find(hasVoidProp)).toThrow(); \/\/ 0 matches\n+ expect(() => render.root.find(hasNestedProp)).toThrow(); \/\/ >1 matches\n \n \/\/ same assertion as .find(), but confirm length\n expect(render.root.findAll(hasFooProp, {deep: false})).toHaveLength(1);\n@@ -91,6 +106,7 @@ describe('ReactTestRendererTraversal', () => {\n expect(render.root.findAll(hasBingProp, {deep: false})).toHaveLength(1);\n expect(render.root.findAll(hasNullProp, {deep: false})).toHaveLength(1);\n expect(render.root.findAll(hasVoidProp, {deep: false})).toHaveLength(0);\n+ expect(render.root.findAll(hasNestedProp, {deep: false})).toHaveLength(3);\n \n \/\/ note: with {deep: true}, .findAll() will continue to\n \/\/ search children, even after finding a match\n@@ -100,6 +116,7 @@ describe('ReactTestRendererTraversal', () => {\n expect(render.root.findAll(hasBingProp)).toHaveLength(1); \/\/ no spread\n expect(render.root.findAll(hasNullProp)).toHaveLength(1); \/\/ no spread\n expect(render.root.findAll(hasVoidProp)).toHaveLength(0);\n+ expect(render.root.findAll(hasNestedProp, {deep: false})).toHaveLength(3);\n \n const bing = render.root.find(hasBingProp);\n expect(bing.find(hasBarProp)).toBe(bing);\n@@ -130,7 +147,7 @@ describe('ReactTestRendererTraversal', () => {\n \n expect(render.root.findAllByType(ExampleFn)).toHaveLength(1);\n expect(render.root.findAllByType(View, {deep: false})).toHaveLength(1);\n- expect(render.root.findAllByType(View)).toHaveLength(8);\n+ expect(render.root.findAllByType(View)).toHaveLength(11);\n expect(render.root.findAllByType(ExampleNull)).toHaveLength(2);\n expect(render.root.findAllByType(ExampleForwardRef)).toHaveLength(1);\n \n@@ -164,4 +181,22 @@ describe('ReactTestRendererTraversal', () => {\n expect(render.root.findAllByProps({baz})).toHaveLength(4);\n expect(render.root.findAllByProps({qux})).toHaveLength(3);\n });\n+\n+ it('skips special nodes', () => {\n+ const render = ReactTestRenderer.create();\n+ expect(render.root.findAllByType(React.Fragment)).toHaveLength(0);\n+ expect(render.root.findAllByType(Context.Consumer)).toHaveLength(0);\n+ expect(render.root.findAllByType(Context.Provider)).toHaveLength(0);\n+\n+ const expectedParent = render.root.findByProps({foo: 'foo'}, {deep: false})\n+ .children[0];\n+ const nestedViews = render.root.findAllByProps(\n+ {nested: true},\n+ {deep: false},\n+ );\n+ expect(nestedViews.length).toBe(3);\n+ expect(nestedViews[0].parent).toBe(expectedParent);\n+ expect(nestedViews[1].parent).toBe(expectedParent);\n+ expect(nestedViews[2].parent).toBe(expectedParent);\n+ });\n });\n","parents":["e96dc140599363029bd05565d58bcd4a432db370"],"body":"","commit":{"authorEmail":"dan.abramov@gmail.com","subject":"Skip special nodes when reading TestInstance.parent (#12813)","authorName":"Dan Abramov","authoredAt":"2018-05-15T11:11:19+01:00","shortRevision":"7dc1a176b5","revision":"7dc1a176b5c50739b200a9d8612a42b110289d22"},"files":[{"path":"packages\/react-test-renderer\/src\/ReactTestRenderer.js","status":"M"},{"path":"packages\/react-test-renderer\/src\/__tests__\/ReactTestRendererTraversal-test.js","status":"M"}]}

dillon1000/react

Files changed