From 19561b60228e0cb1d5b64e036c5935105627d5de Mon Sep 17 00:00:00 2001
From: Brandon Dail <brandondail@fb.com>
Date: Sun, 10 Feb 2019 20:28:06 -0800
Subject: [PATCH] Use elementType in _updateClassComponent

---
 packages/react-test-renderer/src/ReactShallowRenderer.js | 2 +-
 .../src/__tests__/ReactShallowRenderer-test.js           | 2 +-
 .../src/__tests__/ReactShallowRendererMemo-test.js       | 9 ---------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
index 7ad942b1208f3..63d4bd3e983f9 100644
--- a/packages/react-test-renderer/src/ReactShallowRenderer.js
+++ b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -661,7 +661,7 @@ class ReactShallowRenderer {
       // In order to support react-lifecycles-compat polyfilled components,
       // Unsafe lifecycles should not be invoked for components using the new APIs.
       if (
-        typeof element.type.getDerivedStateFromProps !== 'function' &&
+        typeof elementType.getDerivedStateFromProps !== 'function' &&
         typeof this._instance.getSnapshotBeforeUpdate !== 'function'
       ) {
         if (typeof this._instance.componentWillReceiveProps === 'function') {
diff --git a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
index 8eec58e91cb67..fbc544f06bfdf 100644
--- a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js
@@ -1455,7 +1455,7 @@ describe('ReactShallowRenderer', () => {
     expect(logs).toEqual([undefined]);
   });
 
-  it('works with memo', () => {
+  it('should handle memo', () => {
     const Foo = () => {
       <div>Foo</div>;
     };
diff --git a/packages/react-test-renderer/src/__tests__/ReactShallowRendererMemo-test.js b/packages/react-test-renderer/src/__tests__/ReactShallowRendererMemo-test.js
index 4177a4badb9fe..5d668db6e2eb4 100644
--- a/packages/react-test-renderer/src/__tests__/ReactShallowRendererMemo-test.js
+++ b/packages/react-test-renderer/src/__tests__/ReactShallowRendererMemo-test.js
@@ -1539,13 +1539,4 @@ describe('ReactShallowRendererMemo', () => {
     shallowRenderer.render(<Foo foo="bar" />);
     expect(logs).toEqual([undefined]);
   });
-
-  it('should handle memo', () => {
-    const Foo = () => {
-      <div>Foo</div>;
-    };
-    const MemoFoo = React.memo(Foo);
-    const shallowRenderer = createRenderer();
-    shallowRenderer.render(<MemoFoo />);
-  });
 });