{"patch":"diff --git a\/src\/test\/ReactTestUtils.js b\/src\/test\/ReactTestUtils.js\nindex feb4301e31..d5323f6267 100644\n--- a\/src\/test\/ReactTestUtils.js\n+++ b\/src\/test\/ReactTestUtils.js\n@@ -362,14 +362,6 @@ var ReactShallowRenderer = function() {\n this._instance = null;\n };\n \n-ReactShallowRenderer.prototype.getRenderOutput = function() {\n- return (\n- (this._instance && this._instance._renderedComponent &&\n- this._instance._renderedComponent._renderedOutput)\n- || null\n- );\n-};\n-\n ReactShallowRenderer.prototype.getMountedInstance = function() {\n return this._instance ? this._instance._instance : null;\n };\n@@ -435,6 +427,16 @@ ReactShallowRenderer.prototype.render = function(element, context) {\n var transaction = ReactUpdates.ReactReconcileTransaction.getPooled(true);\n this._render(element, transaction, context);\n ReactUpdates.ReactReconcileTransaction.release(transaction);\n+\n+ return this.getRenderOutput();\n+};\n+\n+ReactShallowRenderer.prototype.getRenderOutput = function() {\n+ return (\n+ (this._instance && this._instance._renderedComponent &&\n+ this._instance._renderedComponent._renderedOutput)\n+ || null\n+ );\n };\n \n ReactShallowRenderer.prototype.unmount = function() {\ndiff --git a\/src\/test\/__tests__\/ReactTestUtils-test.js b\/src\/test\/__tests__\/ReactTestUtils-test.js\nindex 2458036198..0e2d15b5b5 100644\n--- a\/src\/test\/__tests__\/ReactTestUtils-test.js\n+++ b\/src\/test\/__tests__\/ReactTestUtils-test.js\n@@ -38,9 +38,7 @@ describe('ReactTestUtils', function() {\n });\n \n var shallowRenderer = ReactTestUtils.createRenderer();\n- shallowRenderer.render();\n-\n- var result = shallowRenderer.getRenderOutput();\n+ var result = shallowRenderer.render();\n \n expect(result.type).toBe('div');\n expect(result.props.children).toEqual([\n@@ -95,9 +93,7 @@ describe('ReactTestUtils', function() {\n });\n \n var shallowRenderer = ReactTestUtils.createRenderer();\n- shallowRenderer.render();\n-\n- var result = shallowRenderer.getRenderOutput();\n+ var result = shallowRenderer.render();\n \n expect(result).toBe(null);\n });\n@@ -148,16 +144,14 @@ describe('ReactTestUtils', function() {\n });\n \n var shallowRenderer = ReactTestUtils.createRenderer();\n- shallowRenderer.render();\n- var result = shallowRenderer.getRenderOutput();\n+ var result = shallowRenderer.render();\n expect(result.type).toBe('div');\n expect(result.props.children).toEqual([\n ,\n ,\n ]);\n \n- shallowRenderer.render();\n- var updatedResult = shallowRenderer.getRenderOutput();\n+ var updatedResult = shallowRenderer.render();\n expect(updatedResult.type).toBe('a');\n \n var mockEvent = {};\n@@ -194,8 +188,7 @@ describe('ReactTestUtils', function() {\n });\n \n var shallowRenderer = ReactTestUtils.createRenderer();\n- shallowRenderer.render();\n- var result = shallowRenderer.getRenderOutput();\n+ var result = shallowRenderer.render();\n expect(result).toEqual(

);\n });\n \n@@ -210,10 +203,9 @@ describe('ReactTestUtils', function() {\n });\n \n var shallowRenderer = ReactTestUtils.createRenderer();\n- shallowRenderer.render(, {\n+ var result = shallowRenderer.render(, {\n name: 'foo',\n });\n- var result = shallowRenderer.getRenderOutput();\n expect(result).toEqual(

foo<\/div>);\n });\n \n@@ -229,7 +221,6 @@ describe('ReactTestUtils', function() {\n 'NonExistentClass'\n );\n expect(scryResults.length).toBe(0);\n-\n });\n \n it('can scryRenderedDOMComponentsWithClass with className contains \\\\n', function() {\n@@ -445,8 +436,8 @@ describe('ReactTestUtils', function() {\n });\n var handler = jasmine.createSpy('spy');\n var shallowRenderer = ReactTestUtils.createRenderer();\n- shallowRenderer.render();\n- var result = shallowRenderer.getRenderOutput();\n+ var result = shallowRenderer.render();\n+\n expect(() => ReactTestUtils.Simulate.click(result)).toThrow(\n 'TestUtils.Simulate expects a component instance and not a ReactElement.' +\n 'TestUtils.Simulate will not work if you are using shallow rendering.'\n","commit":{"authorEmail":"hello@simonewebdesign.it","authoredAt":"2015-11-06T15:55:15+00:00","authorName":"Simone Vittori","subject":"ReactShallowRenderer.render returns the rendered output","shortRevision":"c8b8c818b5","revision":"c8b8c818b568aaa38af68523ad942050cde3262b"},"body":"","files":[{"status":"M","path":"src\/test\/ReactTestUtils.js"},{"status":"M","path":"src\/test\/__tests__\/ReactTestUtils-test.js"}],"parents":["99fbde54a1486fe67b9f715950bfbf66bf3c881c"]}

dillon1000/react

Files changed