Fix ReactTestInstance::toJSON() with empty top-level components (#7523)

facebook · Aug 18, 2016 · 9f5b009 · 9f5b009
1 parent db6f36b
commit 9f5b009
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/renderers/testing/ReactTestMount.js b/src/renderers/testing/ReactTestMount.js
@@ -122,6 +122,9 @@ ReactTestInstance.prototype.unmount = function(nextElement) {
 };
 ReactTestInstance.prototype.toJSON = function() {
   var inst = getHostComponentFromComposite(this._component);
+  if (inst === null) {
+    return null;
+  }
   return inst.toJSON();
 };
 

diff --git a/src/renderers/testing/__tests__/ReactTestRenderer-test.js b/src/renderers/testing/__tests__/ReactTestRenderer-test.js
@@ -28,6 +28,14 @@ describe('ReactTestRenderer', function() {
     });
   });
 
+  it('renders a top-level empty component', function() {
+    function Empty() {
+      return null;
+    }
+    var renderer = ReactTestRenderer.create(<Empty />);
+    expect(renderer.toJSON()).toEqual(null);
+  });
+
   it('exposes a type flag', function() {
     function Link() {
       return <a role="link" />;