From fa45ceee534b6a578370c6e577ff1fefd04c5743 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@apollographql.com>
Date: Tue, 8 Sep 2020 16:20:19 -0400
Subject: [PATCH] Test that mutations await promises returned by
 reobserveQuery.

---
 src/core/__tests__/QueryManager/index.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/core/__tests__/QueryManager/index.ts b/src/core/__tests__/QueryManager/index.ts
index 6dd52d127d1..17bf6ef5189 100644
--- a/src/core/__tests__/QueryManager/index.ts
+++ b/src/core/__tests__/QueryManager/index.ts
@@ -5232,12 +5232,14 @@ describe('QueryManager', () => {
         notifyOnNetworkStatusChange: false,
       });
 
+      let finishedRefetch = false;
+
       return observableToPromise(
         { observable },
         result => {
           expect(stripSymbols(result.data)).toEqual(data);
 
-          queryManager.mutate({
+          return queryManager.mutate({
             mutation,
 
             update(cache) {
@@ -5252,8 +5254,15 @@ describe('QueryManager', () => {
 
             reobserveQuery(obsQuery) {
               expect(obsQuery.options.query).toBe(query);
-              return obsQuery.refetch();
+              return obsQuery.refetch().then(async () => {
+                // Wait a bit to make sure the mutation really awaited the
+                // refetching of the query.
+                await new Promise(resolve => setTimeout(resolve, 100));
+                finishedRefetch = true;
+              });
             },
+          }).then(() => {
+            expect(finishedRefetch).toBe(true);
           });
         },
 
@@ -5262,6 +5271,7 @@ describe('QueryManager', () => {
             secondReqData,
           );
           expect(stripSymbols(result.data)).toEqual(secondReqData);
+          expect(finishedRefetch).toBe(true);
         },
       ).then(resolve, reject);
     });