From 1f7d08f8a58006e7c3cad37252adf18b779a4ad4 Mon Sep 17 00:00:00 2001
From: Keith Lim <keithlimweiluen@gmail.com>
Date: Sat, 8 Dec 2018 12:27:21 -0500
Subject: [PATCH 1/2] [Tests] `props`: add test case for props in async handler

---
 .../enzyme-test-suite/test/_helpers/index.jsx |  6 +++
 .../test/shared/methods/props.jsx             | 46 +++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/packages/enzyme-test-suite/test/_helpers/index.jsx b/packages/enzyme-test-suite/test/_helpers/index.jsx
index 61512fa7d..686148c78 100644
--- a/packages/enzyme-test-suite/test/_helpers/index.jsx
+++ b/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);
+  });
+}
diff --git a/packages/enzyme-test-suite/test/shared/methods/props.jsx b/packages/enzyme-test-suite/test/shared/methods/props.jsx
index 63858efb5..7d23e5eca 100644
--- a/packages/enzyme-test-suite/test/shared/methods/props.jsx
+++ b/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 });
+        });
+      });
+    });
   });
 }

From 79fa8bae3d5f3ba8632aef94a887f157263dbdb1 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Mon, 8 Apr 2019 23:54:39 -0700
Subject: [PATCH 2/2] [meta] attempt to add an autorebase Github action

---
 .github/autorebase.workflow | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .github/autorebase.workflow

diff --git a/.github/autorebase.workflow b/.github/autorebase.workflow
new file mode 100644
index 000000000..2237aa8c5
--- /dev/null
+++ b/.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"]
+}