{"body":"","parents":["44c795c45f0ebae26e0ab919e5b7df28c6104c80"],"patch":"diff --git a\/src\/renderers\/testing\/ReactShallowRendererEntry.js b\/src\/renderers\/testing\/ReactShallowRendererEntry.js\nindex 654cf42973..4920da5319 100644\n--- a\/src\/renderers\/testing\/ReactShallowRendererEntry.js\n+++ b\/src\/renderers\/testing\/ReactShallowRendererEntry.js\n@@ -205,12 +205,14 @@ class Updater {\n }\n \n enqueueSetState(publicInstance, partialState, callback, callerName) {\n+ const currentState = this._renderer._newState || publicInstance.state;\n+\n if (typeof partialState === 'function') {\n- partialState = partialState(publicInstance.state, publicInstance.props);\n+ partialState = partialState(currentState, publicInstance.props);\n }\n \n this._renderer._newState = {\n- ...publicInstance.state,\n+ ...currentState,\n ...partialState,\n };\n \ndiff --git a\/src\/renderers\/testing\/__tests__\/ReactShallowRenderer-test.js b\/src\/renderers\/testing\/__tests__\/ReactShallowRenderer-test.js\nindex 270e8a10d8..90055e863e 100644\n--- a\/src\/renderers\/testing\/__tests__\/ReactShallowRenderer-test.js\n+++ b\/src\/renderers\/testing\/__tests__\/ReactShallowRenderer-test.js\n@@ -450,6 +450,52 @@ describe('ReactShallowRenderer', () => {\n expect(result).toEqual(

doovy<\/div>);\n });\n \n+ it('can setState in componentWillMount repeatedly when shallow rendering', () => {\n+ class SimpleComponent extends React.Component {\n+ state = {\n+ separator: '-',\n+ };\n+\n+ componentWillMount() {\n+ this.setState({groovy: 'doovy'});\n+ this.setState({doovy: 'groovy'});\n+ }\n+\n+ render() {\n+ const {groovy, doovy, separator} = this.state;\n+\n+ return

{`${groovy}${separator}${doovy}`}<\/div>;\n+ }\n+ }\n+\n+ const shallowRenderer = createRenderer();\n+ const result = shallowRenderer.render();\n+ expect(result).toEqual(

doovy-groovy<\/div>);\n+ });\n+\n+ it('can setState in componentWillMount with an updater function repeatedly when shallow rendering', () => {\n+ class SimpleComponent extends React.Component {\n+ state = {\n+ separator: '-',\n+ };\n+\n+ componentWillMount() {\n+ this.setState(state => ({groovy: 'doovy'}));\n+ this.setState(state => ({doovy: state.groovy}));\n+ }\n+\n+ render() {\n+ const {groovy, doovy, separator} = this.state;\n+\n+ return

{`${groovy}${separator}${doovy}`}<\/div>;\n+ }\n+ }\n+\n+ const shallowRenderer = createRenderer();\n+ const result = shallowRenderer.render();\n+ expect(result).toEqual(

doovy-doovy<\/div>);\n+ });\n+\n it('can setState in componentWillReceiveProps when shallow rendering', () => {\n class SimpleComponent extends React.Component {\n state = {count: 0};\n","files":[{"status":"M","path":"src\/renderers\/testing\/ReactShallowRendererEntry.js"},{"status":"M","path":"src\/renderers\/testing\/__tests__\/ReactShallowRenderer-test.js"}],"commit":{"authorEmail":"talpa@yandex.ru","shortRevision":"2264e3d044","authorName":"Filipp Riabchun","revision":"2264e3d04401fc15192a253baaf0ad923096f4b8","authoredAt":"2017-10-10T13:33:57+02:00","subject":"Shallow renderer: support multiple `setState` invocation (#11167)"}}

dillon1000/react

Files changed