align shallow renderer with other renderers in defaulting state to nu…

…ll on mount (#11965)
enzymejs · Jan 5, 2018 · 63791ae · 63791ae
1 parent cd8bc64
commit 63791ae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/ReactShallowRenderer.js b/src/ReactShallowRenderer.js
@@ -125,7 +125,7 @@ class ReactShallowRenderer {
   _mountClassComponent(props, context) {
     this._instance.context = context;
     this._instance.props = props;
-    this._instance.state = this._instance.state || emptyObject;
+    this._instance.state = this._instance.state || null;
     this._instance.updater = this._updater;
 
     if (typeof this._instance.componentWillMount === 'function') {

diff --git a/src/__tests__/ReactShallowRenderer-test.js b/src/__tests__/ReactShallowRenderer-test.js
@@ -947,4 +947,17 @@ describe('ReactShallowRenderer', () => {
     renderAndVerifyWarningAndError([], 'array');
     renderAndVerifyWarningAndError({}, 'object');
   });
+
+  it('should have initial state of null if not defined', () => {
+    class SomeComponent extends React.Component {
+      render() {
+        return <span />;
+      }
+    }
+
+    const shallowRenderer = createRenderer();
+    shallowRenderer.render(<SomeComponent />);
+
+    expect(shallowRenderer.getMountedInstance().state).toBeNull();
+  });
 });