Fix tests

src/test/testMakeRemoteExecutableSchema.ts

@@ -32,15 +32,15 @@ describe('remote subscriptions', () => {
     `);
 
     let notificationCnt = 0;
-    subscribe(schema, subscription).then(results =>
+    subscribe(schema, subscription).then(results => {
       forAwaitEach(results as AsyncIterable<ExecutionResult>, (result: ExecutionResult) => {
         expect(result).to.have.property('data');
         expect(result.data).to.deep.equal(mockNotification);
         !notificationCnt++ ? done() : null;
-      }),
-    );
-
-    subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+      });
+    }).then(() => {
+      subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+    });
   });
 
   it('should work without triggering multiple times per notification', done => {
@@ -59,27 +59,29 @@ describe('remote subscriptions', () => {
     `);
 
     let notificationCnt = 0;
-    subscribe(schema, subscription).then(results =>
+    const sub1 = subscribe(schema, subscription).then(results => {
       forAwaitEach(results as AsyncIterable<ExecutionResult>, (result: ExecutionResult) => {
         expect(result).to.have.property('data');
         expect(result.data).to.deep.equal(mockNotification);
         notificationCnt++;
-      }),
-    );
+      });
+    });
 
-    subscribe(schema, subscription).then(results =>
+    const sub2 = subscribe(schema, subscription).then(results => {
       forAwaitEach(results as AsyncIterable<ExecutionResult>, (result: ExecutionResult) => {
         expect(result).to.have.property('data');
         expect(result.data).to.deep.equal(mockNotification);
-      }),
-    );
+      });
+    });
 
-    subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
-    subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+    Promise.all([sub1, sub2]).then(() => {
+      subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+      subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
 
-    setTimeout(() => {
-      expect(notificationCnt).to.eq(2);
-      done();
-    }, 0);
+      setTimeout(() => {
+        expect(notificationCnt).to.eq(2);
+        done();
+      }, 0);
+    });
   });
 });

src/test/testMergeSchemas.ts

@@ -736,10 +736,9 @@ bookingById(id: "b1") {
                 !notificationCnt++ ? done() : null;
               },
             ).catch(done);
-          })
-          .catch(done);
-
-        subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+          }).then(() => {
+            subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+          }).catch(done);
       });
 
       it('subscription errors are working correctly in merged schema', done => {
@@ -793,10 +792,9 @@ bookingById(id: "b1") {
                 !notificationCnt++ ? done() : null;
               },
             ).catch(done);
-          })
-          .catch(done);
-
-        subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+          }).then(() => {
+            subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+          }).catch(done);
       });
 
       it('links in queries', async () => {

src/test/testResolution.ts

@@ -119,11 +119,11 @@ describe('Resolve', () => {
                 done(new Error('Too many subscription fired'));
               },
             ).catch(done);
-          })
-          .catch(done);
+          }).then(() => {
+            pubsub.publish('printRootChannel', { printRoot: subscriptionRoot });
+          }).catch(done);
       });
 
-      pubsub.publish('printRootChannel', { printRoot: subscriptionRoot });
 
       firstSubsTriggered
         .then(() =>