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

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

@@ -1,4 +1,4 @@
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, waitFor, act } from '@testing-library/react';
 import * as React from 'react';
 import { CustomDataProvider } from '../components/CustomDataProvider';
 import { useDataQuery } from './useDataQuery';
@@ -13,8 +13,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: 42
       };
-
-      const wrapper = (_ref) => {
+      const wrapper = _ref => {
         let {
           children
         } = _ref;
@@ -22,12 +21,10 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const onComplete = jest.fn();
       const onError = jest.fn();
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query, {
         lazy: false,
         onComplete,
@@ -39,15 +36,16 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(onComplete).toHaveBeenCalledWith({
-        x: 42
-      });
-      expect(onError).not.toHaveBeenCalled();
-      expect(result.current).toMatchObject({
-        data: {
+      await waitFor(() => {
+        expect(onComplete).toHaveBeenCalledWith({
           x: 42
-        }
+        });
+        expect(onError).not.toHaveBeenCalled();
+        expect(result.current).toMatchObject({
+          data: {
+            x: 42
+          }
+        });
       });
     });
   });
@@ -64,8 +62,7 @@ describe('useDataQuery', () => {
           throw expectedError;
         }
       };
-
-      const wrapper = (_ref2) => {
+      const wrapper = _ref2 => {
         let {
           children
         } = _ref2;
@@ -73,12 +70,10 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const onComplete = jest.fn();
       const onError = jest.fn();
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query, {
         onError,
         onComplete
@@ -89,11 +84,12 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(onError).toHaveBeenCalledWith(expectedError);
-      expect(onComplete).not.toHaveBeenCalled();
-      expect(result.current).toMatchObject({
-        error: expectedError
+      await waitFor(() => {
+        expect(onError).toHaveBeenCalledWith(expectedError);
+        expect(onComplete).not.toHaveBeenCalled();
+        expect(result.current).toMatchObject({
+          error: expectedError
+        });
       });
     });
   });
@@ -106,7 +102,7 @@ describe('useDataQuery', () => {
       const query = {
         x: {
           resource: 'answer',
-          id: (_ref3) => {
+          id: _ref3 => {
             let {
               id
             } = _ref3;
@@ -118,11 +114,9 @@ describe('useDataQuery', () => {
         let {
           id
         } = _ref4;
-
         switch (id) {
           case one:
             return Promise.resolve(resultOne);
-
           case two:
             return Promise.resolve(resultTwo);
         }
@@ -130,8 +124,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: mockSpy
       };
-
-      const wrapper = (_ref5) => {
+      const wrapper = _ref5 => {
         let {
           children
         } = _ref5;
@@ -139,7 +132,6 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const initialProps = {
         query,
         options: {
@@ -150,7 +142,6 @@ describe('useDataQuery', () => {
       };
       const {
         result,
-        waitForNextUpdate,
         rerender
       } = renderHook(props => useDataQuery(props.query, props.options), {
         wrapper,
@@ -161,11 +152,12 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        data: {
-          x: resultOne
-        }
+      await waitFor(() => {
+        expect(result.current).toMatchObject({
+          data: {
+            x: resultOne
+          }
+        });
       });
       act(() => {
         const newProps = {
@@ -197,8 +189,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: mockSpy
       };
-
-      const wrapper = (_ref6) => {
+      const wrapper = _ref6 => {
         let {
           children
         } = _ref6;
@@ -206,10 +197,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query), {
         wrapper
       });
@@ -217,14 +206,15 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(mockSpy).toHaveBeenCalledTimes(1);
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await waitFor(() => {
+        expect(mockSpy).toHaveBeenCalledTimes(1);
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
     });
   });
@@ -248,8 +238,7 @@ describe('useDataQuery', () => {
           resource: 'answer'
         }
       };
-
-      const wrapper = (_ref7) => {
+      const wrapper = _ref7 => {
         let {
           children
         } = _ref7;
@@ -258,10 +247,8 @@ describe('useDataQuery', () => {
           queryClientOptions: queryClientOptions
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query), {
         wrapper
       });
@@ -270,14 +257,15 @@ 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 waitFor(() => {
+        // Now the cache will contain a value for 'answer' without variables
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
       act(() => {
         // Add a variable to the request to ensure a different cache key
@@ -289,21 +277,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 waitFor(() => {
+        // Now the cache will contain a value for 'answer' with and without variables
+        expect(result.current).toMatchObject({
+          loading: false,
+          data: {
+            x: 43
+          }
+        });
       });
       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,
@@ -325,8 +315,7 @@ describe('useDataQuery', () => {
           resource: 'answer'
         }
       };
-
-      const wrapper = (_ref8) => {
+      const wrapper = _ref8 => {
         let {
           children
         } = _ref8;
@@ -334,10 +323,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => {
         const one = useDataQuery(query);
         const two = useDataQuery(query);
@@ -352,16 +339,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 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', () => {
@@ -374,8 +362,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: 42
       };
-
-      const wrapper = (_ref9) => {
+      const wrapper = _ref9 => {
         let {
           children
         } = _ref9;
@@ -383,10 +370,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query), {
         wrapper
       });
@@ -394,13 +379,14 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await 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 () => {
@@ -416,8 +402,7 @@ describe('useDataQuery', () => {
         answer: 42,
         opposite: 24
       };
-
-      const wrapper = (_ref10) => {
+      const wrapper = _ref10 => {
         let {
           children
         } = _ref10;
@@ -425,10 +410,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query), {
         wrapper
       });
@@ -436,14 +419,15 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42,
-          y: 24
-        }
+      await waitFor(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42,
+            y: 24
+          }
+        });
       });
     });
   });
@@ -460,8 +444,7 @@ describe('useDataQuery', () => {
           throw expectedError;
         }
       };
-
-      const wrapper = (_ref11) => {
+      const wrapper = _ref11 => {
         let {
           children
         } = _ref11;
@@ -469,10 +452,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query), {
         wrapper
       });
@@ -480,11 +461,12 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        error: expectedError
+      await waitFor(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          error: expectedError
+        });
       });
     });
     it('Should return errors it encounters for multiple resource queries', async () => {
@@ -503,8 +485,7 @@ describe('useDataQuery', () => {
         },
         opposite: 24
       };
-
-      const wrapper = (_ref12) => {
+      const wrapper = _ref12 => {
         let {
           children
         } = _ref12;
@@ -512,10 +493,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query), {
         wrapper
       });
@@ -523,11 +502,12 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        error: expectedError
+      await waitFor(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          error: expectedError
+        });
       });
     });
   });
@@ -546,8 +526,7 @@ describe('useDataQuery', () => {
           resource: 'answer'
         }
       };
-
-      const wrapper = (_ref13) => {
+      const wrapper = _ref13 => {
         let {
           children
         } = _ref13;
@@ -555,10 +534,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitFor
+        result
       } = renderHook(() => useDataQuery(query, {
         lazy: true
       }), {
@@ -599,7 +576,6 @@ describe('useDataQuery', () => {
         if (query.id === '1') {
           return 42;
         }
-
         return 0;
       });
       const data = {
@@ -608,7 +584,7 @@ describe('useDataQuery', () => {
       const query = {
         x: {
           resource: 'answer',
-          id: (_ref14) => {
+          id: _ref14 => {
             let {
               id
             } = _ref14;
@@ -616,8 +592,7 @@ describe('useDataQuery', () => {
           }
         }
       };
-
-      const wrapper = (_ref15) => {
+      const wrapper = _ref15 => {
         let {
           children
         } = _ref15;
@@ -625,10 +600,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitFor
+        result
       } = renderHook(() => useDataQuery(query, {
         lazy: true
       }), {
@@ -656,7 +629,6 @@ describe('useDataQuery', () => {
         if (query.id === '1') {
           return 42;
         }
-
         return 0;
       });
       const data = {
@@ -665,7 +637,7 @@ describe('useDataQuery', () => {
       const query = {
         x: {
           resource: 'answer',
-          id: (_ref16) => {
+          id: _ref16 => {
             let {
               id
             } = _ref16;
@@ -673,8 +645,7 @@ describe('useDataQuery', () => {
           }
         }
       };
-
-      const wrapper = (_ref17) => {
+      const wrapper = _ref17 => {
         let {
           children
         } = _ref17;
@@ -682,10 +653,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitFor
+        result
       } = renderHook(() => useDataQuery(query, {
         lazy: true,
         variables: {
@@ -720,8 +689,7 @@ describe('useDataQuery', () => {
           resource: 'answer'
         }
       };
-
-      const wrapper = (_ref18) => {
+      const wrapper = _ref18 => {
         let {
           children
         } = _ref18;
@@ -729,28 +697,29 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
         result,
-        waitForNextUpdate,
         rerender
       } = renderHook(() => useDataQuery(query), {
         wrapper
       });
       const firstRefetch = result.current.refetch;
-      await waitForNextUpdate();
+
+      // await waitFor(() => {})
+
       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 waitFor(() => {
+        expect(result.current.refetch).toBe(firstRefetch);
+      });
     });
     it('Should return stale data and set loading to true on refetch', async () => {
       const answers = [42, 43];
@@ -763,8 +732,7 @@ describe('useDataQuery', () => {
           resource: 'answer'
         }
       };
-
-      const wrapper = (_ref19) => {
+      const wrapper = _ref19 => {
         let {
           children
         } = _ref19;
@@ -772,10 +740,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
         result,
-        waitForNextUpdate,
         rerender
       } = renderHook(() => useDataQuery(query), {
         wrapper
@@ -785,22 +751,23 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await waitFor(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
       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);
@@ -812,15 +779,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 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 () => {
@@ -833,8 +801,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: mockSpy
       };
-
-      const wrapper = (_ref20) => {
+      const wrapper = _ref20 => {
         let {
           children
         } = _ref20;
@@ -842,10 +809,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query, {
         lazy: true
       }), {
@@ -864,13 +829,14 @@ describe('useDataQuery', () => {
         loading: true,
         called: true
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await waitFor(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
     });
     it('Should call onComplete after a successful refetch', async () => {
@@ -882,8 +848,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: 42
       };
-
-      const wrapper = (_ref21) => {
+      const wrapper = _ref21 => {
         let {
           children
         } = _ref21;
@@ -891,12 +856,10 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const onComplete = jest.fn();
       const onError = jest.fn();
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query, {
         lazy: true,
         onComplete,
@@ -907,18 +870,19 @@ describe('useDataQuery', () => {
       act(() => {
         result.current.refetch();
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
+      await 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');
@@ -932,8 +896,7 @@ describe('useDataQuery', () => {
           throw expectedError;
         }
       };
-
-      const wrapper = (_ref22) => {
+      const wrapper = _ref22 => {
         let {
           children
         } = _ref22;
@@ -941,12 +904,10 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const onComplete = jest.fn();
       const onError = jest.fn();
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query, {
         lazy: true,
         onComplete,
@@ -957,11 +918,12 @@ describe('useDataQuery', () => {
       act(() => {
         result.current.refetch();
       });
-      await waitForNextUpdate();
-      expect(onError).toHaveBeenCalledWith(expectedError);
-      expect(onComplete).not.toHaveBeenCalled();
-      expect(result.current).toMatchObject({
-        error: expectedError
+      await 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 () => {
@@ -973,7 +935,7 @@ describe('useDataQuery', () => {
       const query = {
         x: {
           resource: 'answer',
-          params: (_ref23) => {
+          params: _ref23 => {
             let {
               one,
               two,
@@ -991,8 +953,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: spy
       };
-
-      const wrapper = (_ref24) => {
+      const wrapper = _ref24 => {
         let {
           children
         } = _ref24;
@@ -1000,35 +961,35 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query, {
         variables
       }), {
         wrapper
       });
-      await waitForNextUpdate();
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await waitFor(() => {
+        expect(spy).toHaveBeenCalledTimes(1);
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
       });
       act(() => {
         result.current.refetch(variables);
       });
-      await waitForNextUpdate();
-      expect(spy).toHaveBeenCalledTimes(2);
-      expect(result.current).toMatchObject({
-        loading: false,
-        called: true,
-        data: {
-          x: 42
-        }
+      await 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 () => {
@@ -1040,8 +1001,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: 42
       };
-
-      const wrapper = (_ref25) => {
+      const wrapper = _ref25 => {
         let {
           children
         } = _ref25;
@@ -1049,10 +1009,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query, {
         lazy: true
       }), {
@@ -1063,16 +1021,17 @@ describe('useDataQuery', () => {
         // 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 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 () => {
@@ -1084,8 +1043,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: 42
       };
-
-      const wrapper = (_ref26) => {
+      const wrapper = _ref26 => {
         let {
           children
         } = _ref26;
@@ -1093,10 +1051,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query, {
         lazy: false
       }), {
@@ -1107,16 +1063,17 @@ describe('useDataQuery', () => {
         // 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 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 () => {
@@ -1131,8 +1088,7 @@ describe('useDataQuery', () => {
           throw expectedError;
         }
       };
-
-      const wrapper = (_ref27) => {
+      const wrapper = _ref27 => {
         let {
           children
         } = _ref27;
@@ -1140,10 +1096,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query, {
         lazy: true
       }), {
@@ -1154,10 +1108,11 @@ describe('useDataQuery', () => {
         // 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 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 () => {
@@ -1172,8 +1127,7 @@ describe('useDataQuery', () => {
           throw expectedError;
         }
       };
-
-      const wrapper = (_ref28) => {
+      const wrapper = _ref28 => {
         let {
           children
         } = _ref28;
@@ -1181,10 +1135,8 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query, {
         lazy: false
       }), {
@@ -1195,10 +1147,11 @@ describe('useDataQuery', () => {
         // 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 waitFor(() => {
+        expect(reactQueryPromise).resolves.toBeUndefined();
+        expect(result.current).toMatchObject({
+          error: expectedError
+        });
       });
     });
     it('Should accept new variables from refetch', async () => {
@@ -1209,7 +1162,7 @@ describe('useDataQuery', () => {
       const query = {
         x: {
           resource: 'answer',
-          id: (_ref29) => {
+          id: _ref29 => {
             let {
               id
             } = _ref29;
@@ -1221,11 +1174,9 @@ describe('useDataQuery', () => {
         let {
           id
         } = _ref30;
-
         switch (id) {
           case one:
             return Promise.resolve(resultOne);
-
           case two:
             return Promise.resolve(resultTwo);
         }
@@ -1233,8 +1184,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: mockSpy
       };
-
-      const wrapper = (_ref31) => {
+      const wrapper = _ref31 => {
         let {
           children
         } = _ref31;
@@ -1242,7 +1192,6 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const initialProps = {
         query,
         options: {
@@ -1252,29 +1201,30 @@ describe('useDataQuery', () => {
         }
       };
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(props => useDataQuery(props.query, props.options), {
         wrapper,
         initialProps
       });
-      await waitForNextUpdate();
-      expect(result.current).toMatchObject({
-        data: {
-          x: resultOne
-        }
+      await waitFor(() => {
+        expect(result.current).toMatchObject({
+          data: {
+            x: resultOne
+          }
+        });
       });
       act(() => {
         result.current.refetch({
           id: two
         });
       });
-      await waitForNextUpdate();
-      expect(mockSpy).toHaveBeenCalledTimes(2);
-      expect(result.current).toMatchObject({
-        data: {
-          x: resultTwo
-        }
+      await waitFor(() => {
+        expect(mockSpy).toHaveBeenCalledTimes(2);
+        expect(result.current).toMatchObject({
+          data: {
+            x: resultTwo
+          }
+        });
       });
     });
     it('Should merge new variables from refetch with the existing variables', async () => {
@@ -1290,7 +1240,7 @@ describe('useDataQuery', () => {
       const query = {
         x: {
           resource: 'answer',
-          params: (_ref32) => {
+          params: _ref32 => {
             let {
               one,
               two,
@@ -1308,8 +1258,7 @@ describe('useDataQuery', () => {
       const data = {
         answer: mockSpy
       };
-
-      const wrapper = (_ref33) => {
+      const wrapper = _ref33 => {
         let {
           children
         } = _ref33;
@@ -1317,28 +1266,29 @@ describe('useDataQuery', () => {
           data: data
         }, children);
       };
-
       const {
-        result,
-        waitForNextUpdate
+        result
       } = renderHook(() => useDataQuery(query, {
         variables: initialVariables
       }), {
         wrapper
       });
-      await waitForNextUpdate();
-      expect(mockSpy).toHaveBeenLastCalledWith(expect.anything(), expect.objectContaining({
-        params: initialVariables
-      }), expect.anything());
+      await waitFor(() => {
+        expect(mockSpy).toHaveBeenLastCalledWith(expect.anything(), expect.objectContaining({
+          params: initialVariables
+        }), expect.anything());
+      });
       act(() => {
         result.current.refetch(newVariables);
       });
-      await waitForNextUpdate();
-      expect(mockSpy).toHaveBeenLastCalledWith(expect.anything(), expect.objectContaining({
-        params: { ...initialVariables,
-          ...newVariables
-        }
-      }), expect.anything());
+      await waitFor(() => {
+        expect(mockSpy).toHaveBeenLastCalledWith(expect.anything(), expect.objectContaining({
+          params: {
+            ...initialVariables,
+            ...newVariables
+          }
+        }), expect.anything());
+      });
     });
   });
 });