{"body":"","commit":{"revision":"fd47129ce6e8af37004686262bd27fa787af37fc","subject":"Remove support for passing badly typed elements to shallow renderer (#11442)","shortRevision":"fd47129ce6","authorEmail":"dan.abramov@gmail.com","authorName":"Dan Abramov","authoredAt":"2017-11-03T16:16:56+00:00"},"parents":["e8a382343aac011173a8eb68607e904d7ea26e40"],"patch":"diff --git a\/packages\/react-test-renderer\/src\/ReactShallowRenderer.js b\/packages\/react-test-renderer\/src\/ReactShallowRenderer.js\nindex 8f64bef8e0..28af0edb36 100644\n--- a\/packages\/react-test-renderer\/src\/ReactShallowRenderer.js\n+++ b\/packages\/react-test-renderer\/src\/ReactShallowRenderer.js\n@@ -47,6 +47,7 @@ class ReactShallowRenderer {\n 'it by passing it to React.createElement.'\n : '',\n );\n+ \/\/ Show a special message for host elements since it's a common case.\n invariant(\n typeof element.type !== 'string',\n 'ReactShallowRenderer render(): Shallow rendering works only with custom ' +\n@@ -54,6 +55,14 @@ class ReactShallowRenderer {\n 'inspecting the rendered output, look at `el.props` directly instead.',\n element.type,\n );\n+ invariant(\n+ typeof element.type === 'function',\n+ 'ReactShallowRenderer render(): Shallow rendering works only with custom ' +\n+ 'components, but the provided element type was `%s`.',\n+ Array.isArray(element.type)\n+ ? 'array'\n+ : element.type === null ? 'null' : typeof element.type,\n+ );\n \n if (this._rendering) {\n return;\n@@ -144,12 +153,8 @@ class ReactShallowRenderer {\n ) {\n this._instance.componentWillReceiveProps(props, context);\n }\n-\n \/\/ Read state after cWRP in case it calls setState\n- \/\/ Fallback to previous instance state to support rendering React.cloneElement()\n- \/\/ TODO: the cloneElement() use case is broken and should be removed\n- \/\/ https:\/\/github.com\/facebook\/react\/issues\/11441\n- const state = this._newState || this._instance.state || emptyObject;\n+ const state = this._newState || oldState;\n \n let shouldUpdate = true;\n if (this._forcedUpdate) {\n@@ -161,9 +166,7 @@ class ReactShallowRenderer {\n state,\n context,\n );\n- } else if (type && type.prototype && type.prototype.isPureReactComponent) {\n- \/\/ TODO: we can remove the type existence check when we fix this:\n- \/\/ https:\/\/github.com\/facebook\/react\/issues\/11441\n+ } else if (type.prototype && type.prototype.isPureReactComponent) {\n shouldUpdate =\n !shallowEqual(oldProps, props) || !shallowEqual(oldState, state);\n }\ndiff --git a\/packages\/react-test-renderer\/src\/__tests__\/ReactShallowRenderer-test.js b\/packages\/react-test-renderer\/src\/__tests__\/ReactShallowRenderer-test.js\nindex 7bd5cf159c..f7aa3168f4 100644\n--- a\/packages\/react-test-renderer\/src\/__tests__\/ReactShallowRenderer-test.js\n+++ b\/packages\/react-test-renderer\/src\/__tests__\/ReactShallowRenderer-test.js\n@@ -844,12 +844,44 @@ describe('ReactShallowRenderer', () => {\n }\n \n const shallowRenderer = createRenderer();\n- let result = shallowRenderer.render();\n+ const el = ;\n+ let result = shallowRenderer.render(el);\n expect(result).toEqual(

foo:bar<\/div>);\n \n- const instance = shallowRenderer.getMountedInstance();\n- const cloned = React.cloneElement(instance, {foo: 'baz'});\n+ const cloned = React.cloneElement(el, {foo: 'baz'});\n result = shallowRenderer.render(cloned);\n expect(result).toEqual(

baz:bar<\/div>);\n });\n+\n+ it('throws usefully when rendering badly-typed elements', () => {\n+ spyOn(console, 'error');\n+ const shallowRenderer = createRenderer();\n+\n+ var Undef = undefined;\n+ expect(() => shallowRenderer.render()).toThrowError(\n+ 'ReactShallowRenderer render(): Shallow rendering works only with custom ' +\n+ 'components, but the provided element type was `undefined`.',\n+ );\n+\n+ var Null = null;\n+ expect(() => shallowRenderer.render()).toThrowError(\n+ 'ReactShallowRenderer render(): Shallow rendering works only with custom ' +\n+ 'components, but the provided element type was `null`.',\n+ );\n+\n+ var Arr = [];\n+ expect(() => shallowRenderer.render()).toThrowError(\n+ 'ReactShallowRenderer render(): Shallow rendering works only with custom ' +\n+ 'components, but the provided element type was `array`.',\n+ );\n+\n+ var Obj = {};\n+ expect(() => shallowRenderer.render()).toThrowError(\n+ 'ReactShallowRenderer render(): Shallow rendering works only with custom ' +\n+ 'components, but the provided element type was `object`.',\n+ );\n+\n+ \/\/ One warning for each element creation\n+ expectDev(console.error.calls.count()).toBe(4);\n+ });\n });\n","files":[{"path":"packages\/react-test-renderer\/src\/ReactShallowRenderer.js","status":"M"},{"path":"packages\/react-test-renderer\/src\/__tests__\/ReactShallowRenderer-test.js","status":"M"}]}

dillon1000/react

Files changed