wip remove uses of callback api in test, missed in 43a2d1d

ably · Dec 12, 2023 · 6c0a302 · 6c0a302
1 parent 8700889
commit 6c0a302
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 35 deletions.
diff --git a/test/realtime/channel.test.js b/test/realtime/channel.test.js
@@ -686,7 +686,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async
             async.series(
               [
                 function (cb) {
-                  channel.attach(cb);
+                  whenPromiseSettles(channel.attach(), cb);
                 },
                 function (cb) {
                   var channelUpdated = false;
@@ -1100,13 +1100,13 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async
 
         realtime.connection.on('connected', function () {
           channelByEvent = realtime.channels.get('channelsubscribe1-event');
-          channelByEvent.subscribe('event', listenerByEvent, function () {
+          whenPromiseSettles(channelByEvent.subscribe('event', listenerByEvent), function () {
             channelByEvent.publish('event', 'data');
             channelByListener = realtime.channels.get('channelsubscribe1-listener');
-            channelByListener.subscribe(null, listenerNoEvent, function () {
+            whenPromiseSettles(channelByListener.subscribe(null, listenerNoEvent), function () {
               channelByListener.publish(null, 'data');
               channelAll = realtime.channels.get('channelsubscribe1-all');
-              channelAll.subscribe(listenerAllEvents, function () {
+              whenPromiseSettles(channelAll.subscribe(listenerAllEvents), function () {
                 channelAll.publish(null, 'data');
               });
             });

diff --git a/test/realtime/crypto.test.js b/test/realtime/crypto.test.js
@@ -473,7 +473,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async
           });
         }
 
-        channel.attach(function (err) {
+        whenPromiseSettles(channel.attach(), function (err) {
           if (err) {
             closeAndFinish(done, realtime, err);
             return;
@@ -594,17 +594,16 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async
           return;
         }
         var rxChannel = rxRealtime.channels.get(channelName, { cipher: { key: key } });
-        rxChannel.subscribe(
-          'event0',
-          function (msg) {
+        whenPromiseSettles(
+          rxChannel.subscribe('event0', function (msg) {
             try {
               expect(msg.data == messageText).to.be.ok;
             } catch (err) {
               closeAndFinish(done, [txRealtime, rxRealtime], err);
               return;
             }
             closeAndFinish(done, [txRealtime, rxRealtime]);
-          },
+          }),
           function () {
             var txChannel = txRealtime.channels.get(channelName, { cipher: { key: key } });
             txChannel.publish('event0', messageText);

diff --git a/test/realtime/failure.test.js b/test/realtime/failure.test.js
@@ -251,7 +251,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async
           });
         },
         function (callback) {
-          failChan.subscribe('event', noop, function (err) {
+          whenPromiseSettles(failChan.subscribe('event', noop), function (err) {
             try {
               expect(err, 'subscribe failed').to.be.ok;
               expect(err.code).to.equal(channelFailedCode, 'subscribe failure code');
@@ -284,7 +284,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async
           });
         },
         function (callback) {
-          failChan.presence.subscribe('event', noop, function (err) {
+          whenPromiseSettles(failChan.presence.subscribe('event', noop), function (err) {
             try {
               expect(err, 'presence subscribe failed').to.be.ok;
               expect(err.code).to.equal(channelFailedCode, 'subscribe failure code');
@@ -295,7 +295,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async
           });
         },
         function (callback) {
-          failChan.presence.subscribe('event', noop, function (err) {
+          whenPromiseSettles(failChan.presence.subscribe('event', noop), function (err) {
             try {
               expect(err, 'presence unsubscribe failed').to.be.ok;
               expect(err.code).to.equal(channelFailedCode, 'subscribe failure code');

diff --git a/test/realtime/message.test.js b/test/realtime/message.test.js
@@ -399,8 +399,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async
             async.eachSeries(
               testArguments,
               function iterator(args, callback) {
-                args.push(callback);
-                restChannel.publish.apply(restChannel, args);
+                whenPromiseSettles(restChannel.publish.apply(restChannel, args), callback);
               },
               function (err) {
                 if (err) {
@@ -607,12 +606,11 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async
         var realtime = helper.AblyRealtime(realtimeOpts);
         var channel = realtime.channels.get('publish ' + JSON.stringify(realtimeOpts));
         /* subscribe to event */
-        channel.subscribe(
-          'event0',
-          function () {
+        whenPromiseSettles(
+          channel.subscribe('event0', function () {
             --count;
             checkFinish();
-          },
+          }),
           function () {
             var dataFn = function () {
               return 'Hello world at: ' + new Date();

diff --git a/test/realtime/presence.test.js b/test/realtime/presence.test.js
@@ -351,16 +351,16 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async
       var channelName = 'presenceMessageAction';
       var clientChannel = clientRealtime.channels.get(channelName);
       var presence = clientChannel.presence;
-      presence.subscribe(
-        function (presenceMessage) {
+      whenPromiseSettles(
+        presence.subscribe(function (presenceMessage) {
           try {
             expect(presenceMessage.action).to.equal('enter', 'Action should contain string "enter"');
           } catch (err) {
             closeAndFinish(done, clientRealtime, err);
             return;
           }
           closeAndFinish(done, clientRealtime);
-        },
+        }),
         function onPresenceSubscribe(err) {
           if (err) {
             closeAndFinish(done, clientRealtime, err);

diff --git a/test/realtime/shared/delta_tests.js b/test/realtime/shared/delta_tests.js
@@ -91,7 +91,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) {
               });
 
               async.timesSeries(testData.length, function (i, cb) {
-                channel.publish(i.toString(), testData[i], cb);
+                whenPromiseSettles(channel.publish(i.toString(), testData[i]), cb);
               });
             });
 
@@ -129,7 +129,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) {
               });
 
               async.timesSeries(testData.length, function (i, cb) {
-                channel.publish(i.toString(), testData[i], cb);
+                whenPromiseSettles(channel.publish(i.toString(), testData[i]), cb);
               });
             });
 
@@ -193,7 +193,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) {
               });
 
               async.timesSeries(testData.length, function (i, cb) {
-                channel.publish(i.toString(), testData[i], cb);
+                whenPromiseSettles(channel.publish(i.toString(), testData[i]), cb);
               });
             });
 
@@ -241,7 +241,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) {
               });
 
               async.timesSeries(testData.length, function (i, cb) {
-                channel.publish(i.toString(), testData[i], cb);
+                whenPromiseSettles(channel.publish(i.toString(), testData[i]), cb);
               });
             });
 
@@ -273,7 +273,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) {
                 closeAndFinish(done, realtime);
               });
               async.timesSeries(testData.length, function (i, cb) {
-                channel.publish(i.toString(), testData[i], cb);
+                whenPromiseSettles(channel.publish(i.toString(), testData[i]), cb);
               });
             });
 

diff --git a/test/realtime/upgrade.test.js b/test/realtime/upgrade.test.js
@@ -5,7 +5,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai
   var rest;
   var publishIntervalHelper = function (currentMessageNum, channel, dataFn, onPublish) {
     return function (currentMessageNum) {
-      channel.publish('event0', dataFn(), function () {
+      whenPromiseSettles(channel.publish('event0', dataFn()), function () {
         onPublish();
       });
     };
@@ -223,12 +223,11 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai
         var realtime = helper.AblyRealtime(transportOpts);
         var channel = realtime.channels.get('upgradepublish0');
         /* subscribe to event */
-        channel.subscribe(
-          'event0',
-          function () {
+        whenPromiseSettles(
+          channel.subscribe('event0', function () {
             --count;
             checkFinish();
-          },
+          }),
           function () {
             var dataFn = function () {
               return 'Hello world at: ' + new Date();
@@ -257,12 +256,11 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai
         var realtime = helper.AblyRealtime(transportOpts);
         var channel = realtime.channels.get('upgradepublish1');
         /* subscribe to event */
-        channel.subscribe(
-          'event0',
-          function () {
+        whenPromiseSettles(
+          channel.subscribe('event0', function () {
             --count;
             checkFinish();
-          },
+          }),
           function () {
             var dataFn = function () {
               return 'Hello world at: ' + new Date();