Merge pull request #5394 from spicyj/tu-shallow-ref

Revert #4993 with an added test for refs

Author: sophiebits

src/test/ReactTestUtils.js

@@ -431,7 +431,7 @@ ReactShallowRenderer.prototype.render = function(element, context) {
     context = emptyObject;
   }
   var transaction = ReactUpdates.ReactReconcileTransaction.getPooled(true);
-  transaction.perform(this._render, this, element, transaction, context);
+  this._render(element, transaction, context);
   ReactUpdates.ReactReconcileTransaction.release(transaction);
 };
 

src/test/__tests__/ReactTestUtils-test.js

@@ -87,59 +87,31 @@ describe('ReactTestUtils', function() {
     expect(componentWillUnmount).toBeCalled();
   });
 
-  it('should run all lifecycle methods', function() {
-    var componentWillMount = jest.genMockFn();
-    var componentDidMount = jest.genMockFn();
-    var componentWillReceiveProps = jest.genMockFn();
-    var shouldComponentUpdate = jest.genMockFn();
-    var componentWillUpdate = jest.genMockFn();
-    var componentDidUpdate = jest.genMockFn();
-    var componentWillUnmount = jest.genMockFn();
-
+  it('can shallow render to null', function() {
     var SomeComponent = React.createClass({
       render: function() {
-        return <SomeComponent onChange={() => this.setState({a: 1})} />;
-      },
-      componentWillMount,
-      componentDidMount,
-      componentWillReceiveProps,
-      shouldComponentUpdate() {
-        shouldComponentUpdate();
-        return true;
+        return null;
       },
-      componentWillUpdate,
-      componentDidUpdate,
-      componentWillUnmount,
     });
 
     var shallowRenderer = ReactTestUtils.createRenderer();
     shallowRenderer.render(<SomeComponent />);
-    shallowRenderer.getRenderOutput().props.onChange();
-    shallowRenderer.render(<SomeComponent />);
-    shallowRenderer.unmount();
 
-    expect(componentWillMount).toBeCalled();
-    expect(componentDidMount).toBeCalled();
-    expect(componentWillReceiveProps).toBeCalled();
-    expect(shouldComponentUpdate).toBeCalled();
-    expect(componentWillUpdate).toBeCalled();
-    expect(componentDidUpdate).toBeCalled();
-    expect(componentWillUnmount).toBeCalled();
+    var result = shallowRenderer.getRenderOutput();
+
+    expect(result).toBe(null);
   });
 
-  it('can shallow render to null', function() {
+  it('can shallow render with a ref', function() {
     var SomeComponent = React.createClass({
       render: function() {
-        return null;
+        return <div ref="hello" />;
       },
     });
 
     var shallowRenderer = ReactTestUtils.createRenderer();
+    // Shouldn't crash.
     shallowRenderer.render(<SomeComponent />);
-
-    var result = shallowRenderer.getRenderOutput();
-
-    expect(result).toBe(null);
   });
 
   it('lets you update shallowly rendered components', function() {