@dhis2/app-service-data 3.11.3 → 3.12.0-alpha.2

package/build/cjs/react/hooks/useDataQuery.test.js

@@ -1,17 +1,11 @@
 "use strict";
 
-var _reactHooks = require("@testing-library/react-hooks");
-
+var _react = require("@testing-library/react");
 var React = _interopRequireWildcard(require("react"));
-
 var _CustomDataProvider = require("../components/CustomDataProvider");
-
 var _useDataQuery = require("./useDataQuery");
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 describe('useDataQuery', () => {
   describe('parameters: onComplete', () => {
     it('Should call onComplete with the data after a successful fetch', async () => {
@@ -23,8 +17,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: 42
       };
-
-      const wrapper = (_ref) => {
+      const wrapper = _ref => {
         let {
           children
         } = _ref;
@@ -32,13 +25,11 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const onComplete = jest.fn();
       const onError = jest.fn();
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         lazy: false,
         onComplete,
         onError
@@ -49,15 +40,16 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(onComplete).toHaveBeenCalledWith({
-        x: 42
-      });
-      expect(onError).not.toHaveBeenCalled();
-      expect(result.current).toMatchObject({
-        data: {
+      await (0, _react.waitFor)(() => {
+        expect(onComplete).toHaveBeenCalledWith({
           x: 42
-        }
+        });
+        expect(onError).not.toHaveBeenCalled();
+        expect(result.current).toMatchObject({
+          data: {
+            x: 42
+          }
+        });
       });
     });
   });
@@ -74,8 +66,7 @@ describe('useDataQuery', () => {
           throw expectedError;
         }
       };
-
-      const wrapper = (_ref2) => {
+      const wrapper = _ref2 => {
         let {
           children
         } = _ref2;
@@ -83,13 +74,11 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const onComplete = jest.fn();
       const onError = jest.fn();
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         onError,
         onComplete
       }), {
@@ -99,11 +88,12 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(onError).toHaveBeenCalledWith(expectedError);
-      expect(onComplete).not.toHaveBeenCalled();
-      expect(result.current).toMatchObject({
-        error: expectedError
+      await (0, _react.waitFor)(() => {
+        expect(onError).toHaveBeenCalledWith(expectedError);
+        expect(onComplete).not.toHaveBeenCalled();
+        expect(result.current).toMatchObject({
+          error: expectedError
+        });
       });
     });
   });
@@ -116,7 +106,7 @@ describe('useDataQuery', () => {
       const query = {
         x: {
           resource: 'answer',
-          id: (_ref3) => {
+          id: _ref3 => {
             let {
               id
             } = _ref3;
@@ -128,11 +118,9 @@ describe('useDataQuery', () => {
         let {
           id
         } = _ref4;
-
         switch (id) {
           case one:
             return Promise.resolve(resultOne);
-
           case two:
             return Promise.resolve(resultTwo);
         }
@@ -140,8 +128,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: mockSpy
       };
-
-      const wrapper = (_ref5) => {
+      const wrapper = _ref5 => {
         let {
           children
         } = _ref5;
@@ -149,7 +136,6 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const initialProps = {
         query,
         options: {
@@ -160,9 +146,8 @@ describe('useDataQuery', () => {
       };
       const {
         result,
-        waitForNextUpdate,
         rerender
-      } = (0, _reactHooks.renderHook)(props => (0, _useDataQuery.useDataQuery)(props.query, props.options), {
+      } = (0, _react.renderHook)(props => (0, _useDataQuery.useDataQuery)(props.query, props.options), {
         wrapper,
         initialProps
       });
@@ -171,13 +156,14 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        data: {
-          x: resultOne
-        }
+      await (0, _react.waitFor)(() => {
+        expect(result.current).toMatchObject({
+          data: {
+            x: resultOne
+          }
+        });
       });
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         const newProps = {
           query,
           options: {
@@ -207,8 +193,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: mockSpy
       };
-
-      const wrapper = (_ref6) => {
+      const wrapper = _ref6 => {
         let {
           children
         } = _ref6;
@@ -216,25 +201,24 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
         wrapper
       });
       expect(result.current).toMatchObject({
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(mockSpy).toHaveBeenCalledTimes(1);
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await (0, _react.waitFor)(() => {
+        expect(mockSpy).toHaveBeenCalledTimes(1);
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
     });
   });
@@ -258,8 +242,7 @@ describe('useDataQuery', () => {
           resource: 'answer'
         }
       };
-
-      const wrapper = (_ref7) => {
+      const wrapper = _ref7 => {
         let {
           children
         } = _ref7;
@@ -268,11 +251,9 @@ describe('useDataQuery', () => {
           queryClientOptions: queryClientOptions
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
         wrapper
       });
       expect(mockSpy).toHaveBeenCalledTimes(1);
@@ -280,16 +261,17 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate(); // Now the cache will contain a value for 'answer' without variables
-
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await (0, _react.waitFor)(() => {
+        // Now the cache will contain a value for 'answer' without variables
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         // Add a variable to the request to ensure a different cache key
         result.current.refetch({
           one: 1
@@ -299,21 +281,23 @@ describe('useDataQuery', () => {
       expect(result.current).toMatchObject({
         loading: true
       });
-      await waitForNextUpdate(); // Now the cache will contain a value for 'answer' with and without variables
-
-      expect(result.current).toMatchObject({
-        loading: false,
-        data: {
-          x: 43
-        }
+      await (0, _react.waitFor)(() => {
+        // Now the cache will contain a value for 'answer' with and without variables
+        expect(result.current).toMatchObject({
+          loading: false,
+          data: {
+            x: 43
+          }
+        });
       });
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         // Request the resource without variables again
         result.current.refetch({
           one: undefined
         });
-      }); // This should return the resource from the cache without fetching
+      });
 
+      // This should return the resource from the cache without fetching
       expect(mockSpy).toHaveBeenCalledTimes(2);
       expect(result.current).toMatchObject({
         loading: false,
@@ -335,8 +319,7 @@ describe('useDataQuery', () => {
           resource: 'answer'
         }
       };
-
-      const wrapper = (_ref8) => {
+      const wrapper = _ref8 => {
         let {
           children
         } = _ref8;
@@ -344,11 +327,9 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => {
+        result
+      } = (0, _react.renderHook)(() => {
         const one = (0, _useDataQuery.useDataQuery)(query);
         const two = (0, _useDataQuery.useDataQuery)(query);
         const three = (0, _useDataQuery.useDataQuery)(query);
@@ -362,16 +343,17 @@ describe('useDataQuery', () => {
       };
       expect(mockSpy).toHaveBeenCalledTimes(1);
       expect(result.current).toMatchObject([loading, loading, loading]);
-      await waitForNextUpdate();
-      const done = {
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
-      };
-      expect(mockSpy).toHaveBeenCalledTimes(1);
-      expect(result.current).toMatchObject([done, done, done]);
+      await (0, _react.waitFor)(() => {
+        const done = {
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        };
+        expect(mockSpy).toHaveBeenCalledTimes(1);
+        expect(result.current).toMatchObject([done, done, done]);
+      });
     });
   });
   describe('return values: data', () => {
@@ -384,8 +366,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: 42
       };
-
-      const wrapper = (_ref9) => {
+      const wrapper = _ref9 => {
         let {
           children
         } = _ref9;
@@ -393,24 +374,23 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
         wrapper
       });
       expect(result.current).toMatchObject({
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await (0, _react.waitFor)(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
     });
     it('Should return the data for a multiple resource query on success', async () => {
@@ -426,8 +406,7 @@ describe('useDataQuery', () => {
         answer: 42,
         opposite: 24
       };
-
-      const wrapper = (_ref10) => {
+      const wrapper = _ref10 => {
         let {
           children
         } = _ref10;
@@ -435,25 +414,24 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
         wrapper
       });
       expect(result.current).toMatchObject({
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42,
-          y: 24
-        }
+      await (0, _react.waitFor)(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42,
+            y: 24
+          }
+        });
       });
     });
   });
@@ -470,8 +448,7 @@ describe('useDataQuery', () => {
           throw expectedError;
         }
       };
-
-      const wrapper = (_ref11) => {
+      const wrapper = _ref11 => {
         let {
           children
         } = _ref11;
@@ -479,22 +456,21 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
         wrapper
       });
       expect(result.current).toMatchObject({
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        error: expectedError
+      await (0, _react.waitFor)(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          error: expectedError
+        });
       });
     });
     it('Should return errors it encounters for multiple resource queries', async () => {
@@ -513,8 +489,7 @@ describe('useDataQuery', () => {
         },
         opposite: 24
       };
-
-      const wrapper = (_ref12) => {
+      const wrapper = _ref12 => {
         let {
           children
         } = _ref12;
@@ -522,22 +497,21 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
         wrapper
       });
       expect(result.current).toMatchObject({
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        error: expectedError
+      await (0, _react.waitFor)(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          error: expectedError
+        });
       });
     });
   });
@@ -556,8 +530,7 @@ describe('useDataQuery', () => {
           resource: 'answer'
         }
       };
-
-      const wrapper = (_ref13) => {
+      const wrapper = _ref13 => {
         let {
           children
         } = _ref13;
@@ -565,21 +538,19 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitFor
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         lazy: true
       }), {
         wrapper
       });
       expect(spy).not.toHaveBeenCalled();
       const initialRefetch = result.current.refetch;
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         initialRefetch();
       });
-      await waitFor(() => {
+      await (0, _react.waitFor)(() => {
         expect(result.current).toMatchObject({
           loading: false,
           called: true,
@@ -589,10 +560,10 @@ describe('useDataQuery', () => {
         });
       });
       expect(spy).toHaveBeenCalledTimes(1);
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         initialRefetch();
       });
-      await waitFor(() => {
+      await (0, _react.waitFor)(() => {
         expect(result.current).toMatchObject({
           loading: false,
           called: true,
@@ -609,7 +580,6 @@ describe('useDataQuery', () => {
         if (query.id === '1') {
           return 42;
         }
-
         return 0;
       });
       const data = {
@@ -618,7 +588,7 @@ describe('useDataQuery', () => {
       const query = {
         x: {
           resource: 'answer',
-          id: (_ref14) => {
+          id: _ref14 => {
             let {
               id
             } = _ref14;
@@ -626,8 +596,7 @@ describe('useDataQuery', () => {
           }
         }
       };
-
-      const wrapper = (_ref15) => {
+      const wrapper = _ref15 => {
         let {
           children
         } = _ref15;
@@ -635,22 +604,20 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitFor
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         lazy: true
       }), {
         wrapper
       });
       expect(spy).not.toHaveBeenCalled();
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         result.current.refetch({
           id: '1'
         });
       });
-      await waitFor(() => {
+      await (0, _react.waitFor)(() => {
         expect(result.current).toMatchObject({
           loading: false,
           called: true,
@@ -666,7 +633,6 @@ describe('useDataQuery', () => {
         if (query.id === '1') {
           return 42;
         }
-
         return 0;
       });
       const data = {
@@ -675,7 +641,7 @@ describe('useDataQuery', () => {
       const query = {
         x: {
           resource: 'answer',
-          id: (_ref16) => {
+          id: _ref16 => {
             let {
               id
             } = _ref16;
@@ -683,8 +649,7 @@ describe('useDataQuery', () => {
           }
         }
       };
-
-      const wrapper = (_ref17) => {
+      const wrapper = _ref17 => {
         let {
           children
         } = _ref17;
@@ -692,11 +657,9 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitFor
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         lazy: true,
         variables: {
           id: '1'
@@ -705,12 +668,12 @@ describe('useDataQuery', () => {
         wrapper
       });
       expect(spy).not.toHaveBeenCalled();
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         result.current.refetch({
           id: '1'
         });
       });
-      await waitFor(() => {
+      await (0, _react.waitFor)(() => {
         expect(result.current).toMatchObject({
           loading: false,
           called: true,
@@ -730,8 +693,7 @@ describe('useDataQuery', () => {
           resource: 'answer'
         }
       };
-
-      const wrapper = (_ref18) => {
+      const wrapper = _ref18 => {
         let {
           children
         } = _ref18;
@@ -739,28 +701,29 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
         result,
-        waitForNextUpdate,
         rerender
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
         wrapper
       });
       const firstRefetch = result.current.refetch;
-      await waitForNextUpdate();
-      (0, _reactHooks.act)(() => {
+
+      // await waitFor(() => {})
+
+      (0, _react.act)(() => {
         result.current.refetch();
+
         /**
          * FIXME: https://github.com/tannerlinsley/react-query/issues/2481
          * This forced rerender is not necessary in the app, just when testing.
          * It is unclear why.
          */
-
         rerender();
       });
-      await waitForNextUpdate();
-      expect(result.current.refetch).toBe(firstRefetch);
+      await (0, _react.waitFor)(() => {
+        expect(result.current.refetch).toBe(firstRefetch);
+      });
     });
     it('Should return stale data and set loading to true on refetch', async () => {
       const answers = [42, 43];
@@ -773,8 +736,7 @@ describe('useDataQuery', () => {
           resource: 'answer'
         }
       };
-
-      const wrapper = (_ref19) => {
+      const wrapper = _ref19 => {
         let {
           children
         } = _ref19;
@@ -782,12 +744,10 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
         result,
-        waitForNextUpdate,
         rerender
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query), {
         wrapper
       });
       expect(mockSpy).toHaveBeenCalledTimes(1);
@@ -795,22 +755,23 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await (0, _react.waitFor)(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         result.current.refetch();
+
         /**
          * FIXME: https://github.com/tannerlinsley/react-query/issues/2481
          * This forced rerender is not necessary in the app, just when testing.
          * It is unclear why.
          */
-
         rerender();
       });
       expect(mockSpy).toHaveBeenCalledTimes(2);
@@ -822,15 +783,16 @@ describe('useDataQuery', () => {
           x: 42
         }
       });
-      await waitForNextUpdate();
-      expect(mockSpy).toHaveBeenCalledTimes(2);
-      expect(result.current).toMatchObject({
-        loading: false,
-        fetching: false,
-        called: true,
-        data: {
-          x: 43
-        }
+      await (0, _react.waitFor)(() => {
+        expect(mockSpy).toHaveBeenCalledTimes(2);
+        expect(result.current).toMatchObject({
+          loading: false,
+          fetching: false,
+          called: true,
+          data: {
+            x: 43
+          }
+        });
       });
     });
     it('Should not fetch until refetch has been called if lazy', async () => {
@@ -843,8 +805,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: mockSpy
       };
-
-      const wrapper = (_ref20) => {
+      const wrapper = _ref20 => {
         let {
           children
         } = _ref20;
@@ -852,11 +813,9 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         lazy: true
       }), {
         wrapper
@@ -866,7 +825,7 @@ describe('useDataQuery', () => {
         loading: false,
         called: false
       });
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         result.current.refetch();
       });
       expect(mockSpy).toHaveBeenCalledTimes(1);
@@ -874,13 +833,14 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await (0, _react.waitFor)(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
     });
     it('Should call onComplete after a successful refetch', async () => {
@@ -892,8 +852,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: 42
       };
-
-      const wrapper = (_ref21) => {
+      const wrapper = _ref21 => {
         let {
           children
         } = _ref21;
@@ -901,34 +860,33 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const onComplete = jest.fn();
       const onError = jest.fn();
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         lazy: true,
         onComplete,
         onError
       }), {
         wrapper
       });
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         result.current.refetch();
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
+      await (0, _react.waitFor)(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
+        expect(onComplete).toHaveBeenCalledWith({
           x: 42
-        }
-      });
-      expect(onComplete).toHaveBeenCalledWith({
-        x: 42
+        });
+        expect(onError).not.toHaveBeenCalled();
       });
-      expect(onError).not.toHaveBeenCalled();
     });
     it('Should call onError after a failed refetch', async () => {
       const expectedError = new Error('Something went wrong');
@@ -942,8 +900,7 @@ describe('useDataQuery', () => {
           throw expectedError;
         }
       };
-
-      const wrapper = (_ref22) => {
+      const wrapper = _ref22 => {
         let {
           children
         } = _ref22;
@@ -951,27 +908,26 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const onComplete = jest.fn();
       const onError = jest.fn();
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         lazy: true,
         onComplete,
         onError
       }), {
         wrapper
       });
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         result.current.refetch();
       });
-      await waitForNextUpdate();
-      expect(onError).toHaveBeenCalledWith(expectedError);
-      expect(onComplete).not.toHaveBeenCalled();
-      expect(result.current).toMatchObject({
-        error: expectedError
+      await (0, _react.waitFor)(() => {
+        expect(onError).toHaveBeenCalledWith(expectedError);
+        expect(onComplete).not.toHaveBeenCalled();
+        expect(result.current).toMatchObject({
+          error: expectedError
+        });
       });
     });
     it('Should refetch when refetch is called with variables that resolve to the same query key', async () => {
@@ -983,7 +939,7 @@ describe('useDataQuery', () => {
       const query = {
         x: {
           resource: 'answer',
-          params: (_ref23) => {
+          params: _ref23 => {
             let {
               one,
               two,
@@ -1001,8 +957,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: spy
       };
-
-      const wrapper = (_ref24) => {
+      const wrapper = _ref24 => {
         let {
           children
         } = _ref24;
@@ -1010,35 +965,35 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         variables
       }), {
         wrapper
       });
-      await waitForNextUpdate();
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await (0, _react.waitFor)(() => {
+        expect(spy).toHaveBeenCalledTimes(1);
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         result.current.refetch(variables);
       });
-      await waitForNextUpdate();
-      expect(spy).toHaveBeenCalledTimes(2);
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await (0, _react.waitFor)(() => {
+        expect(spy).toHaveBeenCalledTimes(2);
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
     });
     it('Should return a promise that resolves with the data on success when refetching and lazy', async () => {
@@ -1050,8 +1005,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: 42
       };
-
-      const wrapper = (_ref25) => {
+      const wrapper = _ref25 => {
         let {
           children
         } = _ref25;
@@ -1059,30 +1013,29 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         lazy: true
       }), {
         wrapper
       });
       let ourPromise;
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         // This refetch will trigger our own refetch logic as the query is lazy
         ourPromise = result.current.refetch();
       });
-      await waitForNextUpdate();
-      expect(ourPromise).resolves.toEqual({
-        x: 42
-      });
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
+      await (0, _react.waitFor)(() => {
+        expect(ourPromise).resolves.toEqual({
           x: 42
-        }
+        });
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
     });
     it('Should return a promise that resolves with the data on success when refetching and not lazy', async () => {
@@ -1094,8 +1047,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: 42
       };
-
-      const wrapper = (_ref26) => {
+      const wrapper = _ref26 => {
         let {
           children
         } = _ref26;
@@ -1103,30 +1055,29 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         lazy: false
       }), {
         wrapper
       });
       let reactQueryPromise;
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         // This refetch will trigger react query's refetch logic as the query is not lazy
         reactQueryPromise = result.current.refetch();
       });
-      await waitForNextUpdate();
-      expect(reactQueryPromise).resolves.toEqual({
-        x: 42
-      });
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
+      await (0, _react.waitFor)(() => {
+        expect(reactQueryPromise).resolves.toEqual({
           x: 42
-        }
+        });
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
     });
     it('Should return a promise that does not reject on errors when refetching and lazy', async () => {
@@ -1141,8 +1092,7 @@ describe('useDataQuery', () => {
           throw expectedError;
         }
       };
-
-      const wrapper = (_ref27) => {
+      const wrapper = _ref27 => {
         let {
           children
         } = _ref27;
@@ -1150,24 +1100,23 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         lazy: true
       }), {
         wrapper
       });
       let ourPromise;
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         // This refetch will trigger our own refetch logic as the query is lazy
         ourPromise = result.current.refetch();
       });
-      await waitForNextUpdate();
-      expect(ourPromise).resolves.toBeUndefined();
-      expect(result.current).toMatchObject({
-        error: expectedError
+      await (0, _react.waitFor)(() => {
+        expect(ourPromise).resolves.toBeUndefined();
+        expect(result.current).toMatchObject({
+          error: expectedError
+        });
       });
     });
     it('Should return a promise that does not reject on errors when refetching and not lazy', async () => {
@@ -1182,8 +1131,7 @@ describe('useDataQuery', () => {
           throw expectedError;
         }
       };
-
-      const wrapper = (_ref28) => {
+      const wrapper = _ref28 => {
         let {
           children
         } = _ref28;
@@ -1191,24 +1139,23 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         lazy: false
       }), {
         wrapper
       });
       let reactQueryPromise;
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         // This refetch will trigger react query's refetch logic as the query is not lazy
         reactQueryPromise = result.current.refetch();
       });
-      await waitForNextUpdate();
-      expect(reactQueryPromise).resolves.toBeUndefined();
-      expect(result.current).toMatchObject({
-        error: expectedError
+      await (0, _react.waitFor)(() => {
+        expect(reactQueryPromise).resolves.toBeUndefined();
+        expect(result.current).toMatchObject({
+          error: expectedError
+        });
       });
     });
     it('Should accept new variables from refetch', async () => {
@@ -1219,7 +1166,7 @@ describe('useDataQuery', () => {
       const query = {
         x: {
           resource: 'answer',
-          id: (_ref29) => {
+          id: _ref29 => {
             let {
               id
             } = _ref29;
@@ -1231,11 +1178,9 @@ describe('useDataQuery', () => {
         let {
           id
         } = _ref30;
-
         switch (id) {
           case one:
             return Promise.resolve(resultOne);
-
           case two:
             return Promise.resolve(resultTwo);
         }
@@ -1243,8 +1188,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: mockSpy
       };
-
-      const wrapper = (_ref31) => {
+      const wrapper = _ref31 => {
         let {
           children
         } = _ref31;
@@ -1252,7 +1196,6 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const initialProps = {
         query,
         options: {
@@ -1262,29 +1205,30 @@ describe('useDataQuery', () => {
         }
       };
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(props => (0, _useDataQuery.useDataQuery)(props.query, props.options), {
+        result
+      } = (0, _react.renderHook)(props => (0, _useDataQuery.useDataQuery)(props.query, props.options), {
         wrapper,
         initialProps
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        data: {
-          x: resultOne
-        }
+      await (0, _react.waitFor)(() => {
+        expect(result.current).toMatchObject({
+          data: {
+            x: resultOne
+          }
+        });
       });
-      (0, _reactHooks.act)(() => {
+      (0, _react.act)(() => {
         result.current.refetch({
           id: two
         });
       });
-      await waitForNextUpdate();
-      expect(mockSpy).toHaveBeenCalledTimes(2);
-      expect(result.current).toMatchObject({
-        data: {
-          x: resultTwo
-        }
+      await (0, _react.waitFor)(() => {
+        expect(mockSpy).toHaveBeenCalledTimes(2);
+        expect(result.current).toMatchObject({
+          data: {
+            x: resultTwo
+          }
+        });
       });
     });
     it('Should merge new variables from refetch with the existing variables', async () => {
@@ -1300,7 +1244,7 @@ describe('useDataQuery', () => {
       const query = {
         x: {
           resource: 'answer',
-          params: (_ref32) => {
+          params: _ref32 => {
             let {
               one,
               two,
@@ -1318,8 +1262,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: mockSpy
       };
-
-      const wrapper = (_ref33) => {
+      const wrapper = _ref33 => {
         let {
           children
         } = _ref33;
@@ -1327,28 +1270,29 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
-      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        result
+      } = (0, _react.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
         variables: initialVariables
       }), {
         wrapper
       });
-      await waitForNextUpdate();
-      expect(mockSpy).toHaveBeenLastCalledWith(expect.anything(), expect.objectContaining({
-        params: initialVariables
-      }), expect.anything());
-      (0, _reactHooks.act)(() => {
+      await (0, _react.waitFor)(() => {
+        expect(mockSpy).toHaveBeenLastCalledWith(expect.anything(), expect.objectContaining({
+          params: initialVariables
+        }), expect.anything());
+      });
+      (0, _react.act)(() => {
         result.current.refetch(newVariables);
       });
-      await waitForNextUpdate();
-      expect(mockSpy).toHaveBeenLastCalledWith(expect.anything(), expect.objectContaining({
-        params: { ...initialVariables,
-          ...newVariables
-        }
-      }), expect.anything());
+      await (0, _react.waitFor)(() => {
+        expect(mockSpy).toHaveBeenLastCalledWith(expect.anything(), expect.objectContaining({
+          params: {
+            ...initialVariables,
+            ...newVariables
+          }
+        }), expect.anything());
+      });
     });
   });
 });