{"parents":["5b42e895c140b88661a07dd1a1ba80ad6324beb7","df937af91c3fe1f72edb175c1f69a69b5b02a145"],"commit":{"authorName":"Scott Feeney","authorEmail":"scott@oceanbase.org","subject":"Merge pull request #3716 from graue\/optional-shallow-render-context","authoredAt":"2015-04-22T10:54:40-07:00","shortRevision":"d235940037","revision":"d2359400370b43592fb369e7714d5ed4b8c4a04f"},"body":"Shallow render components that define contextTypes","files":[{"path":"src\/test\/ReactTestUtils.js","status":"M"},{"path":"src\/test\/__tests__\/ReactTestUtils-test.js","status":"M"}],"patch":"diff --git a\/src\/test\/ReactTestUtils.js b\/src\/test\/ReactTestUtils.js\nindex 42c878f78f..8e3de23a74 100644\n--- a\/src\/test\/ReactTestUtils.js\n+++ b\/src\/test\/ReactTestUtils.js\n@@ -26,6 +26,7 @@ var ReactUpdates = require('ReactUpdates');\n var SyntheticEvent = require('SyntheticEvent');\n \n var assign = require('Object.assign');\n+var emptyObject = require('emptyObject');\n var findDOMNode = require('findDOMNode');\n \n var topLevelTypes = EventConstants.topLevelTypes;\n@@ -369,6 +370,9 @@ assign(\n );\n \n ReactShallowRenderer.prototype.render = function(element, context) {\n+ if (!context) {\n+ context = emptyObject;\n+ }\n var transaction = ReactUpdates.ReactReconcileTransaction.getPooled();\n this._render(element, transaction, context);\n ReactUpdates.ReactReconcileTransaction.release(transaction);\ndiff --git a\/src\/test\/__tests__\/ReactTestUtils-test.js b\/src\/test\/__tests__\/ReactTestUtils-test.js\nindex aec1197710..32ab6c1483 100644\n--- a\/src\/test\/__tests__\/ReactTestUtils-test.js\n+++ b\/src\/test\/__tests__\/ReactTestUtils-test.js\n@@ -46,7 +46,7 @@ describe('ReactTestUtils', function() {\n });\n \n var shallowRenderer = ReactTestUtils.createRenderer();\n- shallowRenderer.render(, {});\n+ shallowRenderer.render();\n \n var result = shallowRenderer.getRenderOutput();\n \n@@ -68,7 +68,7 @@ describe('ReactTestUtils', function() {\n });\n \n var shallowRenderer = ReactTestUtils.createRenderer();\n- shallowRenderer.render(, {});\n+ shallowRenderer.render();\n shallowRenderer.unmount();\n \n expect(componentWillUnmount).toBeCalled();\n@@ -82,7 +82,7 @@ describe('ReactTestUtils', function() {\n });\n \n var shallowRenderer = ReactTestUtils.createRenderer();\n- shallowRenderer.render(, {});\n+ shallowRenderer.render();\n \n var result = shallowRenderer.getRenderOutput();\n \n@@ -123,7 +123,7 @@ describe('ReactTestUtils', function() {\n });\n \n var shallowRenderer = ReactTestUtils.createRenderer();\n- shallowRenderer.render(, {});\n+ shallowRenderer.render();\n var result = shallowRenderer.getRenderOutput();\n expect(result.type).toBe('div');\n expect(result.props.children).toEqual([\n@@ -131,7 +131,7 @@ describe('ReactTestUtils', function() {\n \n ]);\n \n- shallowRenderer.render(, {});\n+ shallowRenderer.render();\n var updatedResult = shallowRenderer.getRenderOutput();\n expect(updatedResult.type).toBe('a');\n \n@@ -143,6 +143,22 @@ describe('ReactTestUtils', function() {\n expect(updatedResultCausedByClick.props.className).toBe('was-clicked');\n });\n \n+ it('can shallowly render components with contextTypes', function() {\n+ var SimpleComponent = React.createClass({\n+ contextTypes: {\n+ name: React.PropTypes.string,\n+ },\n+ render: function() {\n+ return

;\n+ },\n+ });\n+\n+ var shallowRenderer = ReactTestUtils.createRenderer();\n+ shallowRenderer.render();\n+ var result = shallowRenderer.getRenderOutput();\n+ expect(result).toEqual(

);\n+ });\n+\n it('Test scryRenderedDOMComponentsWithClass with TextComponent', function() {\n var renderedComponent = ReactTestUtils.renderIntoDocument(

Hello Jim<\/span><\/div>);\n var scryResults = ReactTestUtils.scryRenderedDOMComponentsWithClass(\n"}

dillon1000/react

Files changed