Automatically wrap waitForNextUpdate in act. Fixes #14, #110

Author: mpeyper

package-lock.json

@@ -37,8 +37,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.5.4",
-    "@types/react": "^16.8.23",
-    "@types/react-test-renderer": "^16.8.2"
+    "@types/react": ">=16.9.0",
+    "@types/react-test-renderer": ">=16.9.0"
   },
   "devDependencies": {
     "@babel/cli": "7.5.5",
@@ -69,8 +69,8 @@
     "typings-tester": "0.3.2"
   },
   "peerDependencies": {
-    "react": ">=16.8.0",
-    "react-test-renderer": ">=16.8.0"
+    "react": ">=16.9.0",
+    "react-test-renderer": ">=16.9.0"
   },
   "jest": {
     "collectCoverage": true,

package.json

@@ -73,9 +73,20 @@ function renderHook(callback, { initialProps, wrapper } = {}) {
   })
   const { unmount, update } = testRenderer
 
+  let waitingForNextUpdate = null
+  const resolveOnNextUpdate = (resolve) => {
+    addResolver((...args) => {
+      waitingForNextUpdate = null
+      resolve(...args)
+    })
+  }
+
   return {
     result,
-    waitForNextUpdate: () => new Promise((resolve) => addResolver(resolve)),
+    waitForNextUpdate: () => {
+      waitingForNextUpdate = waitingForNextUpdate || act(() => new Promise(resolveOnNextUpdate))
+      return waitingForNextUpdate
+    },
     rerender: (newProps = hookProps.current) => {
       hookProps.current = newProps
       act(() => {