Merge branch 'master' into issue1916

.github/autorebase.workflow

@@ -0,0 +1,9 @@
+workflow "Autorebase on merge commits" {
+  on = "push"
+  resolves = ["docker://ljharb/rebase:latest"]
+}
+
+action "docker://ljharb/rebase:latest" {
+  uses = "docker://ljharb/rebase:latest"
+  secrets = ["GITHUB_TOKEN"]
+}

packages/enzyme-test-suite/test/_helpers/index.jsx

@@ -150,3 +150,9 @@ export function generateEmptyRenderData() {
     { message: 'React element', value: <noscript />, expectResponse: false },
   ];
 }
+
+export function delay(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}

packages/enzyme-test-suite/test/shared/methods/props.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { expect } from 'chai';
 
 import {
+  delay,
   describeIf,
   itIf,
 } from '../../_helpers';
@@ -122,5 +123,50 @@ export default function describeProps({
         });
       });
     });
+
+    describe('props in async handler', () => {
+      class TestComponent extends React.Component {
+        constructor(props) {
+          super(props);
+          this.state = { counter: 1 };
+          this.handleClick = this.handleClick.bind(this);
+        }
+
+        handleClick() {
+          return delay(100).then(() => new Promise((resolve) => {
+            this.setState({ counter: 2 }, () => {
+              resolve();
+            });
+          }));
+        }
+
+        render() {
+          const { counter } = this.state;
+          return (
+            <div id="parentDiv" onClick={this.handleClick}>
+              <TestSubComponent id="childDiv" counter={counter} />
+            </div>
+          );
+        }
+      }
+
+      class TestSubComponent extends React.Component {
+        render() {
+          const { counter } = this.props;
+          return <div>{counter}</div>;
+        }
+      }
+
+      it('child component props should update after call to setState in async handler', () => {
+        const wrapper = Wrap(<TestComponent />);
+        expect(wrapper.find(TestSubComponent).props()).to.eql({ id: 'childDiv', counter: 1 });
+        const promise = wrapper.find('#parentDiv').props().onClick();
+        expect(wrapper.find(TestSubComponent).props()).to.eql({ id: 'childDiv', counter: 1 });
+        return promise.then(() => {
+          wrapper.update();
+          expect(wrapper.find(TestSubComponent).props()).to.eql({ id: 'childDiv', counter: 2 });
+        });
+      });
+    });
   });
 }