Fix ReactShallowRenderer not rerendering when calling forceUpdate() (#11439)

* Fix ReactShallowRenderer not rerendering when calling forceUpdate()

* Style nit

Author: d4rky-pl

src/ReactShallowRenderer.js

@@ -147,9 +147,11 @@ class ReactShallowRenderer {
     // Fallback to previous instance state to support rendering React.cloneElement()
     const state = this._newState || this._instance.state || emptyObject;
 
-    if (typeof this._instance.shouldComponentUpdate === 'function') {
+    if (
+      typeof this._instance.shouldComponentUpdate === 'function' &&
+      !this._forcedUpdate
+    ) {
       if (
-        this._forcedUpdate ||
         this._instance.shouldComponentUpdate(props, state, context) === false
       ) {
         this._instance.context = context;

src/__tests__/ReactShallowRenderer-test.js

@@ -142,6 +142,24 @@ describe('ReactShallowRenderer', () => {
     expect(scuCounter).toEqual(0);
   });
 
+  it('should rerender when calling forceUpdate', () => {
+    let renderCounter = 0;
+    class SimpleComponent extends React.Component {
+      render() {
+        renderCounter += 1;
+        return <div />;
+      }
+    }
+
+    const shallowRenderer = createRenderer();
+    shallowRenderer.render(<SimpleComponent />);
+    expect(renderCounter).toEqual(1);
+
+    const instance = shallowRenderer.getMountedInstance();
+    instance.forceUpdate();
+    expect(renderCounter).toEqual(2);
+  });
+
   it('should shallow render a functional component', () => {
     function SomeComponent(props, context) {
       return (