Add Enzyme wrapper 'async' functions (just 'find' so far) and 'eventually' helper

frontend/test/__support__/integration_tests.js

@@ -5,6 +5,7 @@ import { mount } from "enzyme";
 
 import reducers from "metabase/reducers-main";
 import { getStore } from "metabase/store";
+import { delay } from "metabase/lib/promise";
 
 import { MockResponse } from "xhr-mock";
 
@@ -44,9 +45,44 @@ export function mountWithStore(element) {
 
   const wrapper = mount(<Provider store={store}>{element}</Provider>);
 
+  enhanceEnzymeWrapper(wrapper);
+
   // NOTE: automatically call wrapper.update when the store changes:
   // https://github.com/airbnb/enzyme/blob/ed5848085051ac7afef64a7d045d53b1153a8fe7/docs/guides/migration-from-2-to-3.md#for-mount-updates-are-sometimes-required-when-they-werent-before
   store.subscribe(() => wrapper.update());
 
   return { wrapper, store };
 }
+
+const TIMEOUT = 1000;
+
+async function eventually(fn, timeout = TIMEOUT) {
+  const start = Date.now();
+  while (true) {
+    try {
+      return fn();
+    } catch (e) {
+      if (Date.now() - start > timeout) {
+        throw e;
+      } else {
+        await delay(100);
+      }
+    }
+  }
+}
+
+function enhanceEnzymeWrapper(wrapper) {
+  // add a "async" namespace that wraps functions in `eventually`
+  wrapper.async = {
+    find: selector =>
+      eventually(() => {
+        const node = wrapper.find(selector);
+        if (node.exists()) {
+          return node;
+        } else {
+          throw new Error("Not found: " + selector);
+        }
+      }),
+  };
+  return wrapper;
+}

frontend/test/metabase/admin/people/containers/EditUserModal.integ.spec.js

@@ -20,14 +20,12 @@ describe("EditUserModal", () => {
     const { wrapper, store } = mountWithStore(
       <EditUserModal params={{ userId: 42 }} />,
     );
-    await store.waitForAction("metabase/requests/SET_REQUEST_STATE");
 
-    expect(wrapper.find("input").map(i => i.props().value)).toEqual([
+    const inputs = await wrapper.async.find("input");
+    expect(inputs.map(i => i.props().value)).toEqual([
       "Testy",
       "McTestFace",
       "test@metabase.com",
     ]);
-
-    expect(wrapper.find(".Icon-close").exists()).toBe(true);
   });
 });