Update the tests to use the Promise-based API

test/browser/http.test.js

@@ -3,6 +3,7 @@
 define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) {
   var rest;
   var expect = chai.expect;
+  var whenPromiseSettles = helper.whenPromiseSettles;
 
   describe('rest/http/fetch', function () {
     this.timeout(60 * 1000);
@@ -33,15 +34,15 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) {
 
     it('Should succeed in using fetch to publish a message', function (done) {
       const channel = rest.channels.get('http_test_channel');
-      channel.publish('test', 'Testing fetch support', (err) => {
+      whenPromiseSettles(channel.publish('test', 'Testing fetch support'), (err) => {
         expect(err).to.not.exist;
         done();
       });
     });
 
     it('Should pass errors correctly', function (done) {
       const channel = rest.channels.get('');
-      channel.publish('test', 'Invalid message', (err) => {
+      whenPromiseSettles(channel.publish('test', 'Invalid message'), (err) => {
         expect(err).to.exist;
         done();
       });

test/browser/simple.test.js

@@ -2,6 +2,7 @@
 
 define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) {
   var expect = chai.expect;
+  var whenPromiseSettles = helper.whenPromiseSettles;
 
   describe('browser/simple', function () {
     this.timeout(60 * 1000);
@@ -71,7 +72,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) {
         ably.connection.on('connected', function () {
           connectionTimeout.stop();
           heartbeatTimeout = failWithin(25, done, ably, 'wait for heartbeat');
-          ably.connection.ping(function (err) {
+          whenPromiseSettles(ably.connection.ping(), function (err) {
             heartbeatTimeout.stop();
             done(err);
             ably.close();
@@ -115,7 +116,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) {
         receiveMessagesTimeout = failWithin(15, done, ably, 'wait for published messages to be received');
 
         timer = setInterval(function () {
-          channel.publish('event0', 'Hello world at: ' + new Date(), function (err) {
+          whenPromiseSettles(channel.publish('event0', 'Hello world at: ' + new Date()), function (err) {
             sentCbCount++;
             checkFinish();
           });

test/common/modules/client_module.js

@@ -23,11 +23,11 @@ define(['ably', 'globals', 'test/common/modules/testapp_module'], function (Ably
   }
 
   function ablyRest(options) {
-    return new Ably.Rest(ablyClientOptions(options));
+    return new Ably.Rest.Promise(ablyClientOptions(options));
   }
 
   function ablyRealtime(options) {
-    return new Ably.Realtime(ablyClientOptions(options));
+    return new Ably.Realtime.Promise(ablyClientOptions(options));
   }
 
   return (module.exports = {

test/common/modules/shared_helper.js

@@ -57,6 +57,19 @@ define([
     });
   }
 
+  /**
+   * Uses a callback to communicate the result of a `Promise`. The first argument passed to the callback will be either an error (when the promise is rejected) or `null` (when the promise is fulfilled). In the case where the promise is fulfilled, the resulting value will be passed to the callback as a second argument.
+   */
+  function whenPromiseSettles(promise, callback) {
+    promise
+      .then((result) => {
+        callback(null, result);
+      })
+      .catch((err) => {
+        callback(err);
+      });
+  }
+
   function simulateDroppedConnection(realtime) {
     // Go into the 'disconnected' state before actually disconnecting the transports
     // to avoid the instantaneous reconnect attempt that would be triggered in
@@ -150,11 +163,11 @@ define([
 
   function restTestOnJsonMsgpack(name, testFn, skip) {
     var itFn = skip ? it.skip : it;
-    itFn(name + ' with binary protocol', function (done) {
-      testFn(done, new clientModule.AblyRest({ useBinaryProtocol: true }), name + '_binary');
+    itFn(name + ' with binary protocol', async function () {
+      await testFn(new clientModule.AblyRest({ useBinaryProtocol: true }), name + '_binary');
     });
-    itFn(name + ' with text protocol', function (done) {
-      testFn(done, new clientModule.AblyRest({ useBinaryProtocol: false }), name + '_text');
+    itFn(name + ' with text protocol', async function () {
+      await testFn(new clientModule.AblyRest({ useBinaryProtocol: false }), name + '_text');
     });
   }
 
@@ -235,5 +248,6 @@ define([
     unroutableAddress: unroutableAddress,
     arrFind: arrFind,
     arrFilter: arrFilter,
+    whenPromiseSettles: whenPromiseSettles,
   });
 });

test/realtime/api.test.js

@@ -7,8 +7,6 @@ define(['ably', 'chai'], function (Ably, chai) {
     it('Client constructors', function () {
       expect(typeof Ably.Realtime).to.equal('function');
       expect(typeof Ably.Realtime.Promise).to.equal('function');
-      expect(typeof Ably.Realtime.Callbacks).to.equal('function');
-      expect(Ably.Realtime.Callbacks).to.equal(Ably.Realtime);
     });
 
     it('Crypto', function () {