Fix tests

graphql-subscriptions 1.1.0 only adds listeners after first call to next(), see apollographql/graphql-subscriptions#148
yaacovCR · Jan 8, 2020 · 963955b · 963955b
1 parent 7c0d3a1
commit 963955b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 37 deletions.
diff --git a/src/test/testMakeRemoteExecutableSchema.ts b/src/test/testMakeRemoteExecutableSchema.ts
@@ -33,15 +33,13 @@ 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;
-      })
-    );
-
-    setTimeout(() => {
+      });
+    }).then(() => {
       subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
     });
   });
@@ -62,28 +60,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);
-      })
-    );
+      });
+    });
 
-    setTimeout(() => {
+    Promise.all([sub1, sub2]).then(() => {
       subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
       subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+
       setTimeout(() => {
         expect(notificationCnt).to.eq(2);
         done();
-      });
+      }, 0);
     });
   });
 });

diff --git a/src/test/testMergeSchemas.ts b/src/test/testMergeSchemas.ts
@@ -736,15 +736,9 @@ bookingById(id: "b1") {
                 !notificationCnt++ ? done() : null;
               },
             ).catch(done);
-          })
-          .catch(done);
-
-        setTimeout(() => {
-          subscriptionPubSub.publish(
-            subscriptionPubSubTrigger,
-            mockNotification
-          );
-        });
+          }).then(() => {
+            subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+          }).catch(done);
       });
 
       it('subscription errors are working correctly in merged schema', done => {
@@ -798,15 +792,9 @@ bookingById(id: "b1") {
                 !notificationCnt++ ? done() : null;
               },
             ).catch(done);
-          })
-          .catch(done);
-
-        setTimeout(() => {
-          subscriptionPubSub.publish(
-            subscriptionPubSubTrigger,
-            mockNotification
-          );
-        });
+          }).then(() => {
+            subscriptionPubSub.publish(subscriptionPubSubTrigger, mockNotification);
+          }).catch(done);
       });
 
       it('links in queries', async () => {

diff --git a/src/test/testResolution.ts b/src/test/testResolution.ts
@@ -119,12 +119,9 @@ describe('Resolve', () => {
                 done(new Error('Too many subscription fired'));
               },
             ).catch(done);
-          })
-          .catch(done);
-      });
-
-      setTimeout(() => {
-        pubsub.publish('printRootChannel', { printRoot: subscriptionRoot });
+          }).then(() => {
+            pubsub.publish('printRootChannel', { printRoot: subscriptionRoot });
+          }).catch(done);
       });
 
       firstSubsTriggered