From 86f391eb9bb15d408712ac00a9ee00f6ae6ecd74 Mon Sep 17 00:00:00 2001
From: henrywalton <henry@tallarium.com>
Date: Tue, 23 Feb 2021 12:34:28 +0000
Subject: [PATCH] Don't immediately resolve.

---
 addon/services/apollo.js | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/addon/services/apollo.js b/addon/services/apollo.js
index d47237c0..b76ead0c 100644
--- a/addon/services/apollo.js
+++ b/addon/services/apollo.js
@@ -251,30 +251,27 @@ export default class ApolloService extends Service {
 
     const obj = new EmberApolloSubscription();
 
-    return waitForPromise(
-      new RSVP.Promise((resolve, reject) => {
-        let subscription = observable.subscribe({
-          next: (newData) => {
-            let dataToSend = extractNewData(resultKey, newData);
-            if (dataToSend === null) {
-              // see comment in extractNewData
-              return;
-            }
-
-            run(() => obj._onNewData(dataToSend));
-          },
-          error(e) {
+    return new RSVP.Promise((resolve, reject) => {
+      let subscription = observable.subscribe({
+        next: (newData) => {
+          let dataToSend = extractNewData(resultKey, newData);
+          if (dataToSend === null) {
+            // see comment in extractNewData
+            return;
+          }
+
+          run(() => obj._onNewData(dataToSend));
+          resolve(obj);
+        },
+        error(e) {
             reject(e);
           },
         });
-
         obj._apolloClientSubscription = subscription;
-
-        resolve(obj);
-      })
-    );
+    });
   }
 
+
   /**
    * Executes a single `query` on the Apollo client. The resolved object will
    * never be updated and does not have to be unsubscribed.