From 49c4d9249467bbb7dc609a399fdd35b509594081 Mon Sep 17 00:00:00 2001 From: Lawrence Forooghian Date: Mon, 19 Jun 2023 16:28:18 -0300 Subject: [PATCH] Remove "Promise" from name of Ably*Promise helpers Thus replacing the (unused as of 6fe4914) callback versions. --- test/browser/connection.test.js | 32 +++---- test/browser/http.test.js | 2 +- test/browser/simple.test.js | 2 +- test/common/modules/client_module.js | 10 --- test/common/modules/shared_helper.js | 6 +- test/realtime/auth.test.js | 126 +++++++++++++-------------- test/realtime/channel.test.js | 76 ++++++++-------- test/realtime/connection.test.js | 12 +-- test/realtime/connectivity.test.js | 17 ++-- test/realtime/crypto.test.js | 30 +++---- test/realtime/delta.test.js | 10 +-- test/realtime/encoding.test.js | 8 +- test/realtime/event_emitter.test.js | 34 ++++---- test/realtime/failure.test.js | 22 ++--- test/realtime/history.test.js | 4 +- test/realtime/init.test.js | 26 +++--- test/realtime/message.test.js | 58 ++++++------ test/realtime/presence.test.js | 92 +++++++++---------- test/realtime/reauth.test.js | 4 +- test/realtime/resume.test.js | 34 ++++---- test/realtime/sync.test.js | 14 +-- test/realtime/upgrade.test.js | 30 +++---- test/rest/auth.test.js | 26 +++--- test/rest/capability.test.js | 2 +- test/rest/fallbacks.test.js | 4 +- test/rest/history.test.js | 2 +- test/rest/http.test.js | 2 +- test/rest/init.test.js | 14 +-- test/rest/message.test.js | 18 ++-- test/rest/presence.test.js | 2 +- test/rest/push.test.js | 26 +++--- test/rest/request.test.js | 6 +- test/rest/stats.test.js | 2 +- test/rest/status.test.js | 2 +- test/rest/time.test.js | 2 +- 35 files changed, 368 insertions(+), 389 deletions(-) diff --git a/test/browser/connection.test.js b/test/browser/connection.test.js index 3ae2abdba3..d615c133c8 100644 --- a/test/browser/connection.test.js +++ b/test/browser/connection.test.js @@ -51,7 +51,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('device_going_offline_causes_disconnected_state', function (done) { - var realtime = helper.AblyRealtimePromise(), + var realtime = helper.AblyRealtime(), connection = realtime.connection, offlineEvent = new Event('offline', { bubbles: true }); @@ -94,7 +94,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { it('device_going_online_causes_disconnected_connection_to_reconnect_immediately', function (done) { /* Give up trying to connect fairly quickly */ - var realtime = helper.AblyRealtimePromise({ realtimeRequestTimeout: 1000 }), + var realtime = helper.AblyRealtime({ realtimeRequestTimeout: 1000 }), connection = realtime.connection, onlineEvent = new Event('online', { bubbles: true }); @@ -139,7 +139,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { it('device_going_online_causes_suspended_connection_to_reconnect_immediately', function (done) { /* move to suspended state after 2s of being disconnected */ - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ disconnectedRetryTimeout: 500, realtimeRequestTimeout: 500, connectionStateTtl: 2000, @@ -183,7 +183,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('device_going_online_causes_connecting_connection_to_retry_attempt', function (done) { - var realtime = helper.AblyRealtimePromise({}), + var realtime = helper.AblyRealtime({}), connection = realtime.connection, onlineEvent = new Event('online', { bubbles: true }), oldTransport, @@ -223,7 +223,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { cb(true); }, }, - realtime = helper.AblyRealtimePromise(realtimeOpts), + realtime = helper.AblyRealtime(realtimeOpts), refreshEvent = new Event('beforeunload', { bubbles: true }); monitorConnection(done, realtime); @@ -242,7 +242,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { return; } - var newRealtime = helper.AblyRealtimePromise(realtimeOpts); + var newRealtime = helper.AblyRealtime(realtimeOpts); newRealtime.connection.once('connected', function () { try { expect( @@ -264,7 +264,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { cb(false); }, }; - var realtime = helper.AblyRealtimePromise(realtimeOpts), + var realtime = helper.AblyRealtime(realtimeOpts), refreshEvent = new Event('beforeunload', { bubbles: true }); monitorConnection(done, realtime); @@ -283,7 +283,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { return; } - var newRealtime = helper.AblyRealtimePromise(realtimeOpts); + var newRealtime = helper.AblyRealtime(realtimeOpts); newRealtime.connection.once('connected', function () { try { expect( @@ -301,7 +301,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('page_refresh_with_close_on_unload', function (done) { - var realtime = helper.AblyRealtimePromise({ closeOnUnload: true }), + var realtime = helper.AblyRealtime({ closeOnUnload: true }), refreshEvent = new Event('beforeunload', { bubbles: true }); monitorConnection(done, realtime); @@ -321,7 +321,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('page_refresh_with_manual_recovery', function (done) { - var realtime = helper.AblyRealtimePromise({ closeOnUnload: false }), + var realtime = helper.AblyRealtime({ closeOnUnload: false }), refreshEvent = new Event('beforeunload', { bubbles: true }); monitorConnection(done, realtime); @@ -342,7 +342,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { return; } - var newRealtime = helper.AblyRealtimePromise({ recover: recoveryKey }); + var newRealtime = helper.AblyRealtime({ recover: recoveryKey }); newRealtime.connection.once('connected', function () { try { expect( @@ -359,7 +359,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('persist_preferred_transport', function (done) { - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); realtime.connection.connectionManager.on(function (transport) { if (this.event === 'transport.active' && transport.shortName === 'web_socket') { @@ -381,7 +381,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { var transportPreferenceName = 'ably-transport-preference'; window.localStorage.setItem(transportPreferenceName, JSON.stringify({ value: 'web_socket' })); - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); realtime.connection.connectionManager.on(function (transport) { if (this.event === 'transport.active') { @@ -400,7 +400,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { it('use_persisted_transport1', function (done) { window.localStorage.setItem(transportPreferenceName, JSON.stringify({ value: 'xhr_streaming' })); - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); realtime.connection.connectionManager.on(function (transport) { if (this.event === 'transport.active') { @@ -417,7 +417,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('browser_transports', function (done) { - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); try { expect(realtime.connection.connectionManager.baseTransport).to.equal('xhr_polling'); expect(realtime.connection.connectionManager.upgradeTransports).to.deep.equal([ @@ -437,7 +437,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { * realtime) */ it('connection behaviour with a proxy through which streaming is broken', function (done) { - const realtime = helper.AblyRealtimePromise({ + const realtime = helper.AblyRealtime({ transportParams: { simulateNoStreamingProxy: true, maxStreamDuration: 7500, diff --git a/test/browser/http.test.js b/test/browser/http.test.js index 8c810f04b0..5db5ea7894 100644 --- a/test/browser/http.test.js +++ b/test/browser/http.test.js @@ -12,7 +12,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { initialXhrSupported = Ably.Rest.Platform.Config.xhrSupported; Ably.Rest.Platform.Config.xhrSupported = false; helper.setupApp(function () { - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); done(); }); }); diff --git a/test/browser/simple.test.js b/test/browser/simple.test.js index e4ca140ec1..bfc22014d7 100644 --- a/test/browser/simple.test.js +++ b/test/browser/simple.test.js @@ -23,7 +23,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { function realtimeConnection(transports) { var options = {}; if (transports) options.transports = transports; - return helper.AblyRealtimePromise(options); + return helper.AblyRealtime(options); } function failWithin(timeInSeconds, done, ably, description) { diff --git a/test/common/modules/client_module.js b/test/common/modules/client_module.js index df26c74cff..d0806d6d4b 100644 --- a/test/common/modules/client_module.js +++ b/test/common/modules/client_module.js @@ -23,26 +23,16 @@ define(['ably', 'globals', 'test/common/modules/testapp_module'], function (Ably } function ablyRest(options) { - return new Ably.Rest(ablyClientOptions(options)); - } - - function ablyRestPromise(options) { return new Ably.Rest.Promise(ablyClientOptions(options)); } function ablyRealtime(options) { - return new Ably.Realtime(ablyClientOptions(options)); - } - - function ablyRealtimePromise(options) { return new Ably.Realtime.Promise(ablyClientOptions(options)); } return (module.exports = { Ably: Ably, AblyRest: ablyRest, - AblyRestPromise: ablyRestPromise, AblyRealtime: ablyRealtime, - AblyRealtimePromise: ablyRealtimePromise, }); }); diff --git a/test/common/modules/shared_helper.js b/test/common/modules/shared_helper.js index 8af3164629..0790322075 100644 --- a/test/common/modules/shared_helper.js +++ b/test/common/modules/shared_helper.js @@ -164,10 +164,10 @@ define([ function restTestOnJsonMsgpack(name, testFn, skip) { var itFn = skip ? it.skip : it; itFn(name + ' with binary protocol', async function () { - await testFn(new clientModule.AblyRestPromise({ useBinaryProtocol: true }), name + '_binary'); + await testFn(new clientModule.AblyRest({ useBinaryProtocol: true }), name + '_binary'); }); itFn(name + ' with text protocol', async function () { - await testFn(new clientModule.AblyRestPromise({ useBinaryProtocol: false }), name + '_text'); + await testFn(new clientModule.AblyRest({ useBinaryProtocol: false }), name + '_text'); }); } @@ -226,9 +226,7 @@ define([ Ably: clientModule.Ably, AblyRest: clientModule.AblyRest, - AblyRestPromise: clientModule.AblyRestPromise, AblyRealtime: clientModule.AblyRealtime, - AblyRealtimePromise: clientModule.AblyRealtimePromise, Utils: utils, loadTestData: testAppManager.loadJsonData, diff --git a/test/realtime/auth.test.js b/test/realtime/auth.test.js index b36ca70159..92dde3019a 100644 --- a/test/realtime/auth.test.js +++ b/test/realtime/auth.test.js @@ -40,7 +40,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var rest = helper.AblyRestPromise({ queryTime: true }); + var rest = helper.AblyRest({ queryTime: true }); whenPromiseSettles(rest.time(), function (err, time) { if (err) { done(err); @@ -64,7 +64,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * Base token generation case */ it('authbase0', function (done) { - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); whenPromiseSettles(realtime.auth.requestToken(), function (err, tokenDetails) { if (err) { closeAndFinish(done, realtime, err); @@ -88,7 +88,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('auth_useAuthUrl_json', function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken(null, null), function (err, tokenDetails) { if (err) { closeAndFinish(done, realtime, err); @@ -97,7 +97,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var authPath = echoServer + '/?type=json&body=' + encodeURIComponent(JSON.stringify(tokenDetails)); - realtime = helper.AblyRealtimePromise({ authUrl: authPath }); + realtime = helper.AblyRealtime({ authUrl: authPath }); realtime.connection.on('connected', function () { closeAndFinish(done, realtime); @@ -113,7 +113,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('auth_useAuthUrl_post_json', function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken(null, null), function (err, tokenDetails) { if (err) { closeAndFinish(done, realtime, err); @@ -122,7 +122,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var authUrl = echoServer + '/?type=json&'; - realtime = helper.AblyRealtimePromise({ authUrl: authUrl, authMethod: 'POST', authParams: tokenDetails }); + realtime = helper.AblyRealtime({ authUrl: authUrl, authMethod: 'POST', authParams: tokenDetails }); realtime.connection.on('connected', function () { closeAndFinish(done, realtime); @@ -138,7 +138,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('auth_useAuthUrl_plainText', function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken(null, null), function (err, tokenDetails) { if (err) { closeAndFinish(done, realtime, err); @@ -147,7 +147,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var authPath = echoServer + '/?type=text&body=' + tokenDetails['token']; - realtime = helper.AblyRealtimePromise({ authUrl: authPath }); + realtime = helper.AblyRealtime({ authUrl: authPath }); realtime.connection.on('connected', function () { closeAndFinish(done, realtime); @@ -163,7 +163,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('auth_useAuthCallback_tokenRequestResponse', function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); var authCallback = function (tokenParams, callback) { whenPromiseSettles(rest.auth.createTokenRequest(tokenParams, null), function (err, tokenRequest) { if (err) { @@ -179,7 +179,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); }; - realtime = helper.AblyRealtimePromise({ authCallback: authCallback }); + realtime = helper.AblyRealtime({ authCallback: authCallback }); realtime.connection.on('connected', function () { try { @@ -200,7 +200,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('auth_useAuthCallback_tokenDetailsResponse', function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); var clientId = 'test clientid'; var authCallback = function (tokenParams, callback) { whenPromiseSettles(rest.auth.requestToken(tokenParams, null), function (err, tokenDetails) { @@ -218,7 +218,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); }; - realtime = helper.AblyRealtimePromise({ authCallback: authCallback, clientId: clientId }); + realtime = helper.AblyRealtime({ authCallback: authCallback, clientId: clientId }); realtime.connection.on('connected', function () { try { @@ -237,7 +237,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('auth_useAuthCallback_tokenStringResponse', function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); var authCallback = function (tokenParams, callback) { whenPromiseSettles(rest.auth.requestToken(tokenParams, null), function (err, tokenDetails) { if (err) { @@ -253,7 +253,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); }; - realtime = helper.AblyRealtimePromise({ authCallback: authCallback }); + realtime = helper.AblyRealtime({ authCallback: authCallback }); realtime.connection.on('connected', function () { try { @@ -275,7 +275,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('auth_useAuthUrl_mixed_authParams_qsParams', function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); whenPromiseSettles(rest.auth.createTokenRequest(null, null), function (err, tokenRequest) { if (err) { closeAndFinish(done, realtime, err); @@ -296,7 +296,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }; var authPath = echoServer + '/qs_to_body' + utils.toQueryString(lowerPrecedenceTokenRequestParts); - realtime = helper.AblyRealtimePromise({ authUrl: authPath, authParams: higherPrecedenceTokenRequestParts }); + realtime = helper.AblyRealtime({ authUrl: authPath, authParams: higherPrecedenceTokenRequestParts }); realtime.connection.on('connected', function () { closeAndFinish(done, realtime); @@ -310,7 +310,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * and check that the connection inherits the clientId from the tokenDetails */ it('auth_clientid_inheritance', function (done) { - var rest = helper.AblyRestPromise(), + var rest = helper.AblyRest(), testClientId = 'testClientId'; var authCallback = function (tokenParams, callback) { whenPromiseSettles(rest.auth.requestToken({ clientId: testClientId }), function (err, tokenDetails) { @@ -322,7 +322,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); }; - var realtime = helper.AblyRealtimePromise({ authCallback: authCallback }); + var realtime = helper.AblyRealtime({ authCallback: authCallback }); realtime.connection.on('connected', function () { try { @@ -350,13 +350,13 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('auth_clientid_inheritance2', function (done) { var clientRealtime, testClientId = 'test client id'; - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken({ clientId: testClientId }), function (err, tokenDetails) { if (err) { done(err); return; } - clientRealtime = helper.AblyRealtimePromise({ token: tokenDetails, clientId: 'WRONG' }); + clientRealtime = helper.AblyRealtime({ token: tokenDetails, clientId: 'WRONG' }); clientRealtime.connection.once('failed', function (stateChange) { try { expect(stateChange.reason.code).to.equal(40102); @@ -376,13 +376,13 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('auth_clientid_inheritance3', function (done) { var realtime, testClientId = 'test client id'; - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken({ clientId: '*' }), function (err, tokenDetails) { if (err) { done(err); return; } - realtime = helper.AblyRealtimePromise({ token: tokenDetails.token, clientId: 'test client id' }); + realtime = helper.AblyRealtime({ token: tokenDetails.token, clientId: 'test client id' }); realtime.connection.on('connected', function () { try { expect(realtime.auth.clientId).to.equal(testClientId); @@ -404,13 +404,13 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('auth_clientid_inheritance4', function (done) { var realtime, testClientId = 'test client id'; - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken({ clientId: '*' }), function (err, tokenDetails) { if (err) { done(err); return; } - realtime = helper.AblyRealtimePromise({ token: tokenDetails, clientId: 'test client id' }); + realtime = helper.AblyRealtime({ token: tokenDetails, clientId: 'test client id' }); realtime.connection.on('connected', function () { try { expect(realtime.auth.clientId).to.equal(testClientId); @@ -432,13 +432,13 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('auth_clientid_inheritance5', function (done) { var clientRealtime, testClientId = 'test client id'; - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken({ clientId: testClientId }), function (err, tokenDetails) { if (err) { done(err); return; } - clientRealtime = helper.AblyRealtimePromise({ token: tokenDetails.token }); + clientRealtime = helper.AblyRealtime({ token: tokenDetails.token }); clientRealtime.connection.on('connected', function () { try { expect(clientRealtime.auth.clientId).to.equal(testClientId); @@ -457,7 +457,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ function authCallback_failures(realtimeOptions, expectFailure) { return function (done) { - var realtime = helper.AblyRealtimePromise(realtimeOptions); + var realtime = helper.AblyRealtime(realtimeOptions); realtime.connection.on(function (stateChange) { if (stateChange.previous !== 'initialized') { try { @@ -607,7 +607,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('authUrl_403_previously_active', function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken(null, null), function (err, tokenDetails) { if (err) { closeAndFinish(done, realtime, err); @@ -616,7 +616,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var authPath = echoServer + '/?type=json&body=' + encodeURIComponent(JSON.stringify(tokenDetails)); - realtime = helper.AblyRealtimePromise({ authUrl: authPath }); + realtime = helper.AblyRealtime({ authUrl: authPath }); realtime.connection.on('connected', function () { /* replace the authUrl and reauth */ @@ -649,16 +649,14 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('auth_token_expires', function (realtimeOpts) { return function (done) { var clientRealtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken({ ttl: 5000 }, null), function (err, tokenDetails) { if (err) { done(err); return; } - clientRealtime = helper.AblyRealtimePromise( - mixin(realtimeOpts, { tokenDetails: tokenDetails, queryTime: true }) - ); + clientRealtime = helper.AblyRealtime(mixin(realtimeOpts, { tokenDetails: tokenDetails, queryTime: true })); clientRealtime.connection.on('failed', function () { closeAndFinish(done, clientRealtime, new Error('Failed to connect before token expired')); @@ -685,7 +683,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * and all subsequent requests use the time offset */ it('auth_query_time_once', function (done) { - var rest = helper.AblyRestPromise({ queryTime: true }), + var rest = helper.AblyRest({ queryTime: true }), timeRequestCount = 0, originalTime = rest.time; @@ -743,7 +741,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('auth_tokenDetails_expiry_with_authcallback', function (realtimeOpts) { return function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); var clientId = 'test clientid'; var authCallback = function (tokenParams, callback) { tokenParams.ttl = 5000; @@ -756,7 +754,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); }; - realtime = helper.AblyRealtimePromise(mixin(realtimeOpts, { authCallback: authCallback, clientId: clientId })); + realtime = helper.AblyRealtime(mixin(realtimeOpts, { authCallback: authCallback, clientId: clientId })); monitorConnection(done, realtime); realtime.connection.once('connected', function () { realtime.connection.once('disconnected', function (stateChange) { @@ -784,7 +782,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('auth_token_string_expiry_with_authcallback', function (realtimeOpts) { return function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); var clientId = 'test clientid'; var authCallback = function (tokenParams, callback) { tokenParams.ttl = 5000; @@ -797,7 +795,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); }; - realtime = helper.AblyRealtimePromise(mixin(realtimeOpts, { authCallback: authCallback, clientId: clientId })); + realtime = helper.AblyRealtime(mixin(realtimeOpts, { authCallback: authCallback, clientId: clientId })); monitorConnection(done, realtime); realtime.connection.once('connected', function () { realtime.connection.once('disconnected', function (stateChange) { @@ -824,7 +822,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('auth_token_string_expiry_with_token', function (realtimeOpts) { return function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); var clientId = 'test clientid'; whenPromiseSettles( rest.auth.requestToken({ ttl: 5000, clientId: clientId }, null), @@ -833,9 +831,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async closeAndFinish(done, realtime, err); return; } - realtime = helper.AblyRealtimePromise( - mixin(realtimeOpts, { token: tokenDetails.token, clientId: clientId }) - ); + realtime = helper.AblyRealtime(mixin(realtimeOpts, { token: tokenDetails.token, clientId: clientId })); realtime.connection.once('connected', function () { realtime.connection.once('disconnected', function (stateChange) { try { @@ -867,7 +863,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('auth_expired_token_string', function (realtimeOpts) { return function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); var clientId = 'test clientid'; whenPromiseSettles(rest.auth.requestToken({ ttl: 1, clientId: clientId }, null), function (err, tokenDetails) { if (err) { @@ -875,9 +871,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } setTimeout(function () { - realtime = helper.AblyRealtimePromise( - mixin(realtimeOpts, { token: tokenDetails.token, clientId: clientId }) - ); + realtime = helper.AblyRealtime(mixin(realtimeOpts, { token: tokenDetails.token, clientId: clientId })); realtime.connection.once('failed', function (stateChange) { try { expect(stateChange.reason.code).to.equal(40171, 'Verify correct failure code'); @@ -908,7 +902,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports.skip('reauth_authCallback', function (realtimeOpts) { return function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); var firstTime = true; var authCallback = function (tokenParams, callback) { tokenParams.clientId = '*'; @@ -923,7 +917,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); }; - realtime = helper.AblyRealtimePromise(mixin(realtimeOpts, { authCallback: authCallback })); + realtime = helper.AblyRealtime(mixin(realtimeOpts, { authCallback: authCallback })); realtime.connection.once('connected', function () { var channel = realtime.channels.get('right'); whenPromiseSettles(channel.attach(), function (err) { @@ -960,7 +954,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* RSA10j */ it('authorize_updates_stored_details', function (done) { - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ autoConnect: false, defaultTokenParams: { version: 1 }, token: '1', @@ -991,7 +985,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * Inject a fake AUTH message from realtime, check that we reauth and send our own in reply */ it('mocked_reauth', function (done) { - var rest = helper.AblyRestPromise(), + var rest = helper.AblyRest(), authCallback = function (tokenParams, callback) { // Request a token (should happen twice) whenPromiseSettles(rest.auth.requestToken(tokenParams, null), function (err, tokenDetails) { @@ -1002,7 +996,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async callback(null, tokenDetails); }); }, - realtime = helper.AblyRealtimePromise({ authCallback: authCallback, transports: [helper.bestTransport] }); + realtime = helper.AblyRealtime({ authCallback: authCallback, transports: [helper.bestTransport] }); realtime.connection.once('connected', function () { var transport = realtime.connection.connectionManager.activeProtocol.transport, @@ -1038,7 +1032,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async getJWT(params, callback); }; - var realtime = helper.AblyRealtimePromise({ authCallback: authCallback }); + var realtime = helper.AblyRealtime({ authCallback: authCallback }); realtime.connection.on('connected', function () { try { @@ -1071,7 +1065,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async getJWT(params, callback); }; - var realtime = helper.AblyRealtimePromise({ authCallback: authCallback }); + var realtime = helper.AblyRealtime({ authCallback: authCallback }); realtime.connection.on('connected', function () { try { @@ -1102,7 +1096,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async getJWT(params, callback); }; - var realtime = helper.AblyRealtimePromise({ authCallback: authCallback }); + var realtime = helper.AblyRealtime({ authCallback: authCallback }); realtime.connection.once('connected', function () { var channel = realtime.channels.get(jwtTestChannelName); whenPromiseSettles(channel.publish('greeting', 'Hello World!'), function (err) { @@ -1131,7 +1125,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var publishEvent = 'publishEvent', messageData = 'Hello World!'; - var realtime = helper.AblyRealtimePromise({ authCallback: authCallback }); + var realtime = helper.AblyRealtime({ authCallback: authCallback }); realtime.connection.once('connected', function () { var channel = realtime.channels.get(jwtTestChannelName); channel.subscribe(publishEvent, function (msg) { @@ -1158,7 +1152,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async getJWT(params, callback); }; - var realtime = helper.AblyRealtimePromise({ authCallback: authCallback }); + var realtime = helper.AblyRealtime({ authCallback: authCallback }); realtime.connection.once('connected', function () { realtime.connection.once('disconnected', function (stateChange) { try { @@ -1185,7 +1179,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async getJWT(params, callback); }; - var realtime = helper.AblyRealtimePromise({ authCallback: authCallback }); + var realtime = helper.AblyRealtime({ authCallback: authCallback }); realtime.connection.once('connected', function () { var originalToken = realtime.auth.tokenDetails.token; realtime.connection.once('update', function () { @@ -1212,7 +1206,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async done(err); return; } - var realtime = helper.AblyRealtimePromise({ token: token }); + var realtime = helper.AblyRealtime({ token: token }); realtime.connection.once('connected', function () { try { expect(token).to.equal(realtime.auth.tokenDetails.token, 'Verify that token is the same'); @@ -1228,7 +1222,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* RTN14b */ it('reauth_consistently_expired_token', function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken({ ttl: 1 }), function (err, token) { if (err) { done(err); @@ -1241,7 +1235,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }; /* Wait a few ms to ensure token is expired */ setTimeout(function () { - realtime = helper.AblyRealtimePromise({ authCallback: authCallback, disconnectedRetryTimeout: 15000 }); + realtime = helper.AblyRealtime({ authCallback: authCallback, disconnectedRetryTimeout: 15000 }); /* Wait 5s, expect to have seen two attempts to get a token -- so the * authCallback called twice -- and the connection to now be sitting in * the disconnected state */ @@ -1261,7 +1255,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* RSA4b1 - only autoremove expired tokens if have a server time offset set */ it('expired_token_no_autoremove_when_dont_have_servertime', function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken(), function (err, token) { if (err) { done(err); @@ -1274,7 +1268,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async authCallbackCallCount++; callback(null, token); }; - realtime = helper.AblyRealtimePromise({ authCallback: authCallback }); + realtime = helper.AblyRealtime({ authCallback: authCallback }); realtime.connection.on('connected', function () { try { expect(authCallbackCallCount).to.equal(1, 'Check we did not autoremove an expired token ourselves'); @@ -1289,7 +1283,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* RSA4b1 second case */ it('expired_token_autoremove_when_have_servertime', function (done) { var realtime, - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken(), function (err, token) { if (err) { done(err); @@ -1302,7 +1296,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async authCallbackCallCount++; callback(null, token); }; - realtime = helper.AblyRealtimePromise({ authCallback: authCallback, autoConnect: false }); + realtime = helper.AblyRealtime({ authCallback: authCallback, autoConnect: false }); /* Set the server time offset */ whenPromiseSettles(realtime.time(), function () { realtime.connect(); @@ -1323,7 +1317,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* Check that only the last authorize matters */ it('multiple_concurrent_authorize', function (done) { - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ logLevel: 4, useTokenAuth: true, defaultTokenParams: { capability: { wrong: ['*'] } }, @@ -1368,7 +1362,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('authorize_immediately_after_init', function (realtimeOpts) { return function (done) { - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ useTokenAuth: true, defaultTokenParams: { capability: { wrong: ['*'] } }, }); diff --git a/test/realtime/channel.test.js b/test/realtime/channel.test.js index 9447865aa6..aee99ab380 100644 --- a/test/realtime/channel.test.js +++ b/test/realtime/channel.test.js @@ -177,7 +177,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('channelinit0', function (realtimeOpts) { return function (done) { try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.on('connected', function () { try { /* set options on init */ @@ -210,7 +210,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('channelattach0', function (realtimeOpts) { return function (done) { try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.on('connected', function () { var channel0 = realtime.channels.get('channelattach0'); whenPromiseSettles(channel0.attach(), function (err) { @@ -233,7 +233,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('channelattach2', function (realtimeOpts) { return function (done) { try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); var channel2 = realtime.channels.get('channelattach2'); whenPromiseSettles(channel2.attach(), function (err) { if (err) { @@ -257,7 +257,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async function (realtimeOpts) { return function (done) { try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.on('connected', function () { var channel0 = realtime.channels.get('channelattach3'); whenPromiseSettles(channel0.attach(), function (err) { @@ -295,7 +295,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('channelattachempty', function (realtimeOpts) { return function (done) { try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.once('connected', function () { var channel0 = realtime.channels.get(''); whenPromiseSettles(channel0.attach(), function (err) { @@ -327,7 +327,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('channelattachinvalid', function (realtimeOpts) { return function (done) { try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.once('connected', function () { var channel = realtime.channels.get(':hell'); whenPromiseSettles(channel.attach(), function (err) { @@ -365,7 +365,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('publish_no_attach', function (realtimeOpts) { return function (done) { try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.once('connected', function () { whenPromiseSettles(realtime.channels.get('publish_no_attach').publish(), function (err) { if (err) { @@ -388,7 +388,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('channelattach_publish_invalid', function (realtimeOpts) { return function (done) { try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.once('connected', function () { whenPromiseSettles(realtime.channels.get(':hell').publish(), function (err) { if (err) { @@ -417,7 +417,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('channelattach_invalid_twice', function (realtimeOpts) { return function (done) { try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.once('connected', function () { whenPromiseSettles(realtime.channels.get(':hell').attach(), function (err) { if (err) { @@ -453,7 +453,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('channelattachOnceOrIfAfter', function (done) { try { - var realtime = helper.AblyRealtimePromise(), + var realtime = helper.AblyRealtime(), channel = realtime.channels.get('channelattachOnceOrIf'), firedImmediately = false; @@ -479,7 +479,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('channelattachOnceOrIfBefore', function (done) { try { - var realtime = helper.AblyRealtimePromise(), + var realtime = helper.AblyRealtime(), channel = realtime.channels.get('channelattachOnceOrIf'), firedImmediately = false; @@ -504,7 +504,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return function (done) { var testName = 'attachWithChannelParamsBasicChannelsGet'; try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.on('connected', function () { var params = { modes: 'subscribe', @@ -528,7 +528,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var testRealtime = helper.AblyRealtimePromise(); + var testRealtime = helper.AblyRealtime(); testRealtime.connection.on('connected', function () { var testChannel = testRealtime.channels.get(testName); async.series( @@ -557,7 +557,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return function (done) { var testName = 'attachWithChannelParamsBasicSetOptions'; try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.on('connected', function () { var params = { modes: 'subscribe', @@ -577,7 +577,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async expect(channel.params).to.deep.equal(params, 'Check result params'); expect(channel.modes).to.deep.equal(['subscribe'], 'Check result modes'); - var testRealtime = helper.AblyRealtimePromise(); + var testRealtime = helper.AblyRealtime(); testRealtime.connection.on('connected', function () { var testChannel = testRealtime.channels.get(testName); async.series( @@ -606,7 +606,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return function (done) { var testName = 'subscribeAfterSetOptions'; try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.on('connected', function () { var channel = realtime.channels.get(testName); channel.setOptions({ @@ -635,7 +635,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('channelGetShouldThrowWhenWouldCauseReattach', function (done) { var testName = 'channelGetShouldThrowWhenWouldCauseReattach'; try { - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); realtime.connection.on('connected', function () { var params = { modes: 'subscribe', @@ -676,7 +676,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return function (done) { var testName = 'setOptionsCallbackBehaviour'; try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.on('connected', function () { var params = { modes: 'subscribe', @@ -752,7 +752,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return function (done) { var testName = 'attachWithChannelParamsModesAndChannelModes'; try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.on('connected', function () { var paramsModes = ['presence', 'subscribe']; var params = { @@ -777,7 +777,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var testRealtime = helper.AblyRealtimePromise(); + var testRealtime = helper.AblyRealtime(); testRealtime.connection.on('connected', function () { var testChannel = testRealtime.channels.get(testName); async.series( @@ -806,7 +806,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return function (done) { var testName = 'attachWithChannelModes'; try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.on('connected', function () { var modes = ['publish', 'presence_subscribe']; var channelOptions = { @@ -826,7 +826,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var testRealtime = helper.AblyRealtimePromise(); + var testRealtime = helper.AblyRealtime(); testRealtime.connection.on('connected', function () { var testChannel = testRealtime.channels.get(testName); async.series( @@ -855,7 +855,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return function (done) { var testName = 'attachWithChannelParamsDeltaAndModes'; try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.on('connected', function () { var modes = ['publish', 'subscribe', 'presence_subscribe']; var channelOptions = { @@ -877,7 +877,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var testRealtime = helper.AblyRealtimePromise(); + var testRealtime = helper.AblyRealtime(); testRealtime.connection.on('connected', function () { var testChannel = testRealtime.channels.get(testName); async.series( @@ -906,7 +906,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var testName = 'attachWithInvalidChannelParams'; var defaultChannelModes = 'presence,publish,subscribe,presence_subscribe'; try { - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); realtime.connection.on('connected', function () { var channel = realtime.channels.get(testName); async.series( @@ -1012,7 +1012,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('channelsubscribe0', function (done) { try { - var realtime = helper.AblyRealtimePromise({ useBinaryProtocol: true }); + var realtime = helper.AblyRealtime({ useBinaryProtocol: true }); realtime.connection.on('connected', function () { var channel6 = realtime.channels.get('channelsubscribe0'); whenPromiseSettles(channel6.attach(), function (err) { @@ -1048,7 +1048,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var messagesReceived = 0; try { - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); var channelByEvent, channelByListener, channelAll; var unsubscribeTest = function () { @@ -1123,7 +1123,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * immediate reattach. If that fails, it should go into suspended */ it('server_sent_detached', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: [helper.bestTransport] }), + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport] }), channelName = 'server_sent_detached', channel = realtime.channels.get(channelName); @@ -1174,7 +1174,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * result in the channel becoming suspended */ it('server_sent_detached_while_attaching', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: [helper.bestTransport] }), + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport] }), channelName = 'server_sent_detached_while_attaching', channel = realtime.channels.get(channelName); @@ -1214,7 +1214,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * A server-sent ERROR, with channel field, should fail the channel */ it('server_sent_error', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: [helper.bestTransport] }), + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport] }), channelName = 'server_sent_error', channel = realtime.channels.get(channelName); @@ -1251,7 +1251,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * should emit an UPDATE event on the channel */ it('server_sent_attached_err', function (done) { - var realtime = helper.AblyRealtimePromise(), + var realtime = helper.AblyRealtime(), channelName = 'server_sent_attached_err', channel = realtime.channels.get(channelName); @@ -1295,7 +1295,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * Check that queueMessages: false disables queuing for connection queue state */ it('publish_no_queueing', function (done) { - var realtime = helper.AblyRealtimePromise({ queueMessages: false }), + var realtime = helper.AblyRealtime({ queueMessages: false }), channel = realtime.channels.get('publish_no_queueing'); /* try a publish while not yet connected */ @@ -1314,7 +1314,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('channel_attach_timeout', function (done) { /* Use a fixed transport as attaches are resent when the transport changes */ - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport], realtimeRequestTimeout: 2000, channelRetryTimeout: 100, @@ -1362,7 +1362,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('suspended_connection', function (done) { /* Use a fixed transport as attaches are resent when the transport changes */ /* Browsers throttle setTimeouts to min 1s in in active tabs; having timeouts less than that screws with the relative timings */ - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport], channelRetryTimeout: 1010, suspendedRetryTimeout: 1100, @@ -1430,7 +1430,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* RTL5i */ it('attached_while_detaching', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: [helper.bestTransport] }), + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport] }), channelName = 'server_sent_detached', channel = realtime.channels.get(channelName); @@ -1473,7 +1473,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async // RTL5j it('detaching from suspended channel transitions channel to detached state', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: [helper.bestTransport] }); + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport] }); var channelName = 'detach_from_suspended'; var channel = realtime.channels.get(channelName); @@ -1489,7 +1489,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async // RTL5b it('detaching from failed channel results in error', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: [helper.bestTransport] }); + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport] }); var channelName = 'detach_from_failed'; var channel = realtime.channels.get(channelName); @@ -1505,7 +1505,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); it('rewind works on channel after reattaching', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: [helper.bestTransport] }); + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport] }); var channelName = 'rewind_after_detach'; var channel = realtime.channels.get(channelName); var channelOpts = { params: { rewind: '1' } }; diff --git a/test/realtime/connection.test.js b/test/realtime/connection.test.js index d0923de040..16f13c65ac 100644 --- a/test/realtime/connection.test.js +++ b/test/realtime/connection.test.js @@ -23,7 +23,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('connectionPing', function (done) { var realtime; try { - realtime = helper.AblyRealtimePromise(); + realtime = helper.AblyRealtime(); realtime.connection.on('connected', function () { try { realtime.connection.ping(); @@ -41,7 +41,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('connectionPingWithCallback', function (done) { var realtime; try { - realtime = helper.AblyRealtimePromise(); + realtime = helper.AblyRealtime(); realtime.connection.on('connected', function () { whenPromiseSettles(realtime.connection.ping(), function (err, responseTime) { if (err) { @@ -66,7 +66,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('connectionAttributes', function (done) { var realtime; try { - realtime = helper.AblyRealtimePromise({ logLevel: 4 }); + realtime = helper.AblyRealtime({ logLevel: 4 }); realtime.connection.on('connected', function () { try { const recoveryContext = JSON.parse(realtime.connection.recoveryKey); @@ -131,7 +131,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async channelSerials: {}, }); try { - realtime = helper.AblyRealtimePromise({ recover: fakeRecoveryKey }); + realtime = helper.AblyRealtime({ recover: fakeRecoveryKey }); realtime.connection.on('connected', function (stateChange) { try { expect(stateChange.reason.code).to.equal( @@ -167,7 +167,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * without being merged with new messages) */ it('connectionQueuing', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: [helper.bestTransport] }), + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport] }), channel = realtime.channels.get('connectionQueuing'), connectionManager = realtime.connection.connectionManager; @@ -248,7 +248,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * Inject a new CONNECTED with different connectionDetails; check they're used */ it('connectionDetails', function (done) { - var realtime = helper.AblyRealtimePromise(), + var realtime = helper.AblyRealtime(), connectionManager = realtime.connection.connectionManager; realtime.connection.once('connected', function () { connectionManager.once('connectiondetails', function (details) { diff --git a/test/realtime/connectivity.test.js b/test/realtime/connectivity.test.js index ca3cfd4949..ea4edc9177 100644 --- a/test/realtime/connectivity.test.js +++ b/test/realtime/connectivity.test.js @@ -47,7 +47,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { } it('succeeds with scheme', function (done) { - new helper.AblyRealtimePromise(options(urlScheme + successUrl)).http.checkConnectivity(function (err, res) { + new helper.AblyRealtime(options(urlScheme + successUrl)).http.checkConnectivity(function (err, res) { try { expect(res && !err, 'Connectivity check completed ' + (err && utils.inspectError(err))).to.be.ok; } catch (err) { @@ -59,7 +59,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { }); it('fails with scheme', function (done) { - new helper.AblyRealtimePromise(options(urlScheme + failUrl)).http.checkConnectivity(function (err, res) { + new helper.AblyRealtime(options(urlScheme + failUrl)).http.checkConnectivity(function (err, res) { try { expect(!res, 'Connectivity check expected to return false').to.be.ok; done(); @@ -70,7 +70,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { }); it('succeeds with querystring', function (done) { - new helper.AblyRealtimePromise(options(successUrl)).http.checkConnectivity(function (err, res) { + new helper.AblyRealtime(options(successUrl)).http.checkConnectivity(function (err, res) { try { expect(res && !err, 'Connectivity check completed ' + (err && utils.inspectError(err))).to.be.ok; done(); @@ -81,7 +81,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { }); it('fails with querystring', function (done) { - new helper.AblyRealtimePromise(options(failUrl)).http.checkConnectivity(function (err, res) { + new helper.AblyRealtime(options(failUrl)).http.checkConnectivity(function (err, res) { try { expect(!res, 'Connectivity check expected to return false').to.be.ok; done(); @@ -92,10 +92,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { }); it('succeeds with plain url', function (done) { - new helper.AblyRealtimePromise(options('sandbox-rest.ably.io/time')).http.checkConnectivity(function ( - err, - res - ) { + new helper.AblyRealtime(options('sandbox-rest.ably.io/time')).http.checkConnectivity(function (err, res) { try { expect(res && !err, 'Connectivity check completed ' + (err && utils.inspectError(err))).to.be.ok; done(); @@ -106,7 +103,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { }); it('fails with plain url', function (done) { - new helper.AblyRealtimePromise(options('echo.ably.io')).http.checkConnectivity(function (err, res) { + new helper.AblyRealtime(options('echo.ably.io')).http.checkConnectivity(function (err, res) { try { expect(!res, 'Connectivity check expected to return false').to.be.ok; done(); @@ -118,7 +115,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { }); it('disable_connectivity_check', function (done) { - new helper.AblyRealtimePromise({ + new helper.AblyRealtime({ connectivityCheckUrl: 'notarealhost', disableConnectivityCheck: true, }).http.checkConnectivity(function (err, res) { diff --git a/test/realtime/crypto.test.js b/test/realtime/crypto.test.js index a430aefa23..ba8f8d13bb 100644 --- a/test/realtime/crypto.test.js +++ b/test/realtime/crypto.test.js @@ -62,7 +62,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async done(new Error('Unable to get test assets; err = ' + displayError(err))); return; } - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); var key = BufferUtils.base64Decode(testData.key); var iv = BufferUtils.base64Decode(testData.iv); var channel = realtime.channels.get(channelName, { cipher: { key: key, iv: iv } }); @@ -409,7 +409,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* For single_send tests we test the 'shortcut' way of setting the cipher * in channels.get. No callback, but that's ok even for node which has * async iv generation since the publish is on an attach cb */ - var realtime = helper.AblyRealtimePromise(realtimeOpts), + var realtime = helper.AblyRealtime(realtimeOpts), channel = realtime.channels.get('single_send', { cipher: { key: key } }), messageText = 'Test message for single_send - ' + JSON.stringify(realtimeOpts); @@ -459,7 +459,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var realtime = helper.AblyRealtimePromise({ useBinaryProtocol: !text }); + var realtime = helper.AblyRealtime({ useBinaryProtocol: !text }); var channelName = 'multiple_send_' + (text ? 'text_' : 'binary_') + iterations + '_' + delay, channel = realtime.channels.get(channelName), messageText = 'Test message (' + channelName + ')'; @@ -527,8 +527,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var txRealtime = helper.AblyRealtimePromise(txOpts), - rxRealtime = helper.AblyRealtimePromise(rxOpts), + var txRealtime = helper.AblyRealtime(txOpts), + rxRealtime = helper.AblyRealtime(rxOpts), channelName = 'single_send_separate_realtimes'; var messageText = 'Test message for single_send_separate_realtimes', txChannel = txRealtime.channels.get(channelName), @@ -603,8 +603,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var txRealtime = helper.AblyRealtimePromise(), - rxRealtime = helper.AblyRealtimePromise(), + var txRealtime = helper.AblyRealtime(), + rxRealtime = helper.AblyRealtime(), channelName = 'publish_immediately', messageText = 'Test message'; @@ -645,8 +645,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var txRealtime = helper.AblyRealtimePromise(); - var rxRealtime = helper.AblyRealtimePromise(); + var txRealtime = helper.AblyRealtime(); + var rxRealtime = helper.AblyRealtime(); var channelName = 'single_send_key_mismatch', txChannel = txRealtime.channels.get(channelName), messageText = 'Test message (' + channelName + ')', @@ -711,8 +711,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var txRealtime = helper.AblyRealtimePromise(); - var rxRealtime = helper.AblyRealtimePromise(); + var txRealtime = helper.AblyRealtime(); + var rxRealtime = helper.AblyRealtime(); var channelName = 'single_send_unencrypted', txChannel = txRealtime.channels.get(channelName), messageText = 'Test message (' + channelName + ')', @@ -754,8 +754,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var txRealtime = helper.AblyRealtimePromise(); - var rxRealtime = helper.AblyRealtimePromise(); + var txRealtime = helper.AblyRealtime(); + var rxRealtime = helper.AblyRealtime(); var channelName = 'single_send_encrypted_unhandled', txChannel = txRealtime.channels.get(channelName), messageText = 'Test message (' + channelName + ')', @@ -798,8 +798,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var txRealtime = helper.AblyRealtimePromise(); - var rxRealtime = helper.AblyRealtimePromise(); + var txRealtime = helper.AblyRealtime(); + var rxRealtime = helper.AblyRealtime(); var channelName = 'set_cipher_params', txChannel = txRealtime.channels.get(channelName), messageText = 'Test message (' + channelName + ')', diff --git a/test/realtime/delta.test.js b/test/realtime/delta.test.js index b66d5951c5..006133c26d 100644 --- a/test/realtime/delta.test.js +++ b/test/realtime/delta.test.js @@ -44,7 +44,7 @@ define(['shared_helper', 'vcdiff-decoder', 'async', 'chai'], function (helper, v var testName = 'deltaPlugin'; try { var testVcdiffDecoder = getTestVcdiffDecoder(); - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ plugins: { vcdiff: testVcdiffDecoder, }, @@ -93,7 +93,7 @@ define(['shared_helper', 'vcdiff-decoder', 'async', 'chai'], function (helper, v var testName = 'unusedPlugin'; try { var testVcdiffDecoder = getTestVcdiffDecoder(); - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ plugins: { vcdiff: testVcdiffDecoder, }, @@ -133,7 +133,7 @@ define(['shared_helper', 'vcdiff-decoder', 'async', 'chai'], function (helper, v var testName = 'lastMessageNotFoundRecovery'; try { var testVcdiffDecoder = getTestVcdiffDecoder(); - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ plugins: { vcdiff: testVcdiffDecoder, }, @@ -201,7 +201,7 @@ define(['shared_helper', 'vcdiff-decoder', 'async', 'chai'], function (helper, v }, }; - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ plugins: { vcdiff: failingTestVcdiffDecoder, }, @@ -246,7 +246,7 @@ define(['shared_helper', 'vcdiff-decoder', 'async', 'chai'], function (helper, v /* Check that channel becomes failed if we get deltas when we don't have a vcdiff plugin */ it('noPlugin', function (done) { try { - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); var channel = realtime.channels.get('noPlugin', { params: { delta: 'vcdiff' } }); whenPromiseSettles(channel.attach(), function (err) { diff --git a/test/realtime/encoding.test.js b/test/realtime/encoding.test.js index b7837a8ab5..f7c9e49c10 100644 --- a/test/realtime/encoding.test.js +++ b/test/realtime/encoding.test.js @@ -32,8 +32,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async done(err); return; } - var realtime = helper.AblyRealtimePromise({ useBinaryProtocol: false }), - binaryrealtime = helper.AblyRealtimePromise({ useBinaryProtocol: true }), + var realtime = helper.AblyRealtime({ useBinaryProtocol: false }), + binaryrealtime = helper.AblyRealtime({ useBinaryProtocol: true }), channelName = 'message_decoding', channelPath = '/channels/' + channelName + '/messages', channel = realtime.channels.get(channelName), @@ -133,8 +133,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async done(new Error('Unable to get test assets; err = ' + displayError(err))); return; } - var realtime = helper.AblyRealtimePromise({ useBinaryProtocol: false }), - binaryrealtime = helper.AblyRealtimePromise({ useBinaryProtocol: true }), + var realtime = helper.AblyRealtime({ useBinaryProtocol: false }), + binaryrealtime = helper.AblyRealtime({ useBinaryProtocol: true }), channelName = 'message_encoding', channelPath = '/channels/' + channelName + '/messages', channel = realtime.channels.get(channelName), diff --git a/test/realtime/event_emitter.test.js b/test/realtime/event_emitter.test.js index 36043e2b7d..4575594f21 100644 --- a/test/realtime/event_emitter.test.js +++ b/test/realtime/event_emitter.test.js @@ -28,7 +28,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { /* Note: realtime now sends an ATTACHED post-upgrade, which can race with * the DETACHED if the DETACH is only sent just after upgrade. Remove * bestTransport with 1.1 spec which has IDs in ATTACHs */ - var realtime = helper.AblyRealtimePromise({ transports: [helper.bestTransport] }), + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport] }), index, expectedConnectionEvents = ['connecting', 'connected', 'closing', 'closed'], expectedChannelEvents = ['attaching', 'attached', 'detaching', 'detached']; @@ -74,7 +74,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('emitCallsAllCallbacksIgnoringExceptions', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), callbackCalled = false, eventEmitter = realtime.connection; @@ -99,7 +99,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('onceCalledOnlyOnce', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), onCallbackCalled = 0, onceCallbackCalled = 0, eventEmitter = realtime.connection; @@ -127,7 +127,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('onceCallbackDoesNotImpactOnCallback', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), callbackCalled = 0, eventEmitter = realtime.connection; @@ -153,7 +153,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('offRemovesAllMatchingListeners', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), callbackCalled = 0, eventEmitter = realtime.connection; @@ -182,7 +182,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('offRemovesAllListeners', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), callbackCalled = 0, eventEmitter = realtime.connection; @@ -211,7 +211,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('offRemovesAllMatchingEventListeners', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), callbackCalled = 0, eventEmitter = realtime.connection; @@ -240,7 +240,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('offRemovesAllMatchingEvents', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), callbackCalled = 0, eventEmitter = realtime.connection; @@ -276,7 +276,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { * for each previously registered event name */ it('offRemovesEmptyEventNameListeners', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), eventEmitter = realtime.connection; var callback = function () {}; @@ -304,7 +304,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('arrayOfEvents', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), callbackCalled = 0, eventEmitter = realtime.connection; @@ -343,7 +343,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('arrayOfEventsWithOnce', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), callbackCalled = 0, eventEmitter = realtime.connection; @@ -370,7 +370,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { /* check that listeners added in a listener cb are not called during that * emit instance */ it('listenerAddedInListenerCb', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), eventEmitter = realtime.connection, firstCbCalled = false, secondCbCalled = false; @@ -397,7 +397,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { /* check that listeners removed in a listener cb are still called in that * emit instance (but only once) */ it('listenerRemovedInListenerCb', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), eventEmitter = realtime.connection, onCbCalledTimes = 0, onceCbCalledTimes = 0, @@ -442,7 +442,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { if (typeof Promise !== 'undefined') { describe('event_emitter_promise', function () { it('whenState', function (done) { - var realtime = helper.AblyRealtimePromise({ internal: { promises: true } }); + var realtime = helper.AblyRealtime({ internal: { promises: true } }); var eventEmitter = realtime.connection; eventEmitter @@ -456,7 +456,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('once', function (done) { - var realtime = helper.AblyRealtimePromise({ internal: { promises: true } }); + var realtime = helper.AblyRealtime({ internal: { promises: true } }); var eventEmitter = realtime.connection; eventEmitter @@ -470,7 +470,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('anyEventsWithOnce', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), eventEmitter = realtime.connection; const p = eventEmitter.once(); @@ -483,7 +483,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { }); it('arrayOfEventsWithOnce', function (done) { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), eventEmitter = realtime.connection; const p = eventEmitter.once(['a', 'b', 'c']); diff --git a/test/realtime/failure.test.js b/test/realtime/failure.test.js index c8576e578d..6e2339434c 100644 --- a/test/realtime/failure.test.js +++ b/test/realtime/failure.test.js @@ -29,7 +29,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async try { var failure_test = function (transports) { return function (cb) { - var realtime = helper.AblyRealtimePromise({ key: 'this.is:wrong', transports: transports }); + var realtime = helper.AblyRealtime({ key: 'this.is:wrong', transports: transports }); realtime.connection.on('failed', function (connectionStateChange) { try { expect(realtime.connection.errorReason.code).to.equal(40400, 'wrong error reason code on connection.'); @@ -78,7 +78,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async try { var break_test = function (transports) { return function (cb) { - var realtime = helper.AblyRealtimePromise({ transports: transports }); + var realtime = helper.AblyRealtime({ transports: transports }); realtime.connection.once('connected', function () { realtime.connection.once('disconnected', function () { cb(null, realtime); @@ -117,7 +117,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var lifecycleTest = function (transports) { return function (cb) { var connectionEvents = []; - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ transports: transports, realtimeHost: 'invalid', restHost: 'invalid', @@ -189,7 +189,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async utils.arrForEach(availableTransports, function (transport) { it('disconnected_backoff_' + transport, function (done) { var disconnectedRetryTimeout = 150; - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ disconnectedRetryTimeout: disconnectedRetryTimeout, realtimeHost: 'invalid', restHost: 'invalid', @@ -220,7 +220,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * Check operations on a failed channel give the right errors */ it('failed_channel', function (done) { - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); var failChan; var channelFailedCode = 90001; @@ -326,7 +326,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); it('attach_timeout', function (done) { - var realtime = helper.AblyRealtimePromise({ realtimeRequestTimeout: 2000, channelRetryTimeout: 1000 }), + var realtime = helper.AblyRealtime({ realtimeRequestTimeout: 2000, channelRetryTimeout: 1000 }), channel = realtime.channels.get('failed_attach'), originalProcessMessage = channel.processMessage.bind(channel); @@ -362,7 +362,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async utils.arrForEach(availableTransports, function (transport) { it('channel_backoff_' + transport, function (done) { var channelRetryTimeout = 150; - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ channelRetryTimeout: channelRetryTimeout, transports: [transport], }), @@ -423,7 +423,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async function nack_on_connection_failure(failureFn, expectedRealtimeState, expectedNackCode) { return function (done) { /* Use one transport because stubbing out transport#onProtocolMesage */ - var realtime = helper.AblyRealtimePromise({ transports: [helper.bestTransport] }), + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport] }), channel = realtime.channels.get('nack_on_connection_failure'); async.series( @@ -508,7 +508,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async ); it('idle_transport_timeout', function (done) { - var realtime = helper.AblyRealtimePromise({ realtimeRequestTimeout: 2000 }), + var realtime = helper.AblyRealtime({ realtimeRequestTimeout: 2000 }), originalOnProtocolMessage; realtime.connection.connectionManager.on('transport.pending', function (transport) { @@ -546,7 +546,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return function (done) { /* Use the echoserver as a fallback host because it doesn't support * websockets, so it'll fail to connect, which we can detect */ - var realtime = helper.AblyRealtimePromise(utils.mixin({ fallbackHosts: ['echo.ably.io'] }, realtimeOpts)), + var realtime = helper.AblyRealtime(utils.mixin({ fallbackHosts: ['echo.ably.io'] }, realtimeOpts)), connection = realtime.connection, connectionManager = connection.connectionManager; @@ -586,7 +586,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var testMessage2 = { foo: 'bar', count: 2, status: 'active' }; try { - var sender_realtime = helper.AblyRealtimePromise(); + var sender_realtime = helper.AblyRealtime(); var sender_channel = sender_realtime.channels.get(testName); var messageReceived = false; diff --git a/test/realtime/history.test.js b/test/realtime/history.test.js index 73112e343f..a32ad2c72a 100644 --- a/test/realtime/history.test.js +++ b/test/realtime/history.test.js @@ -47,8 +47,8 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { }); it('history_until_attach', function (done) { - var rest = helper.AblyRestPromise(); - var realtime = helper.AblyRealtimePromise(); + var rest = helper.AblyRest(); + var realtime = helper.AblyRealtime(); var restChannel = rest.channels.get('persisted:history_until_attach'); /* first, send a number of events to this channel before attaching */ diff --git a/test/realtime/init.test.js b/test/realtime/init.test.js index e494f2708e..998a1c2623 100644 --- a/test/realtime/init.test.js +++ b/test/realtime/init.test.js @@ -29,7 +29,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { it('initbase0', function (done) { var realtime; try { - realtime = helper.AblyRealtimePromise({ transports: ['web_socket', 'xhr_streaming'] }); + realtime = helper.AblyRealtime({ transports: ['web_socket', 'xhr_streaming'] }); realtime.connection.on('connected', function () { /* check api version */ var transport = realtime.connection.connectionManager.activeProtocol.transport; @@ -73,7 +73,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { it('init_token_string', function (done) { try { /* first generate a token ... */ - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); var testKeyOpts = { key: helper.getTestApp().keys[1].keyStr }; whenPromiseSettles(rest.auth.requestToken(null, testKeyOpts), function (err, tokenDetails) { @@ -103,7 +103,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { var realtime; try { var keyStr = helper.getTestApp().keys[0].keyStr; - realtime = helper.AblyRealtimePromise({ key: keyStr, useTokenAuth: true }); + realtime = helper.AblyRealtime({ key: keyStr, useTokenAuth: true }); expect(realtime.options.key).to.equal(keyStr); expect(realtime.auth.method).to.equal('token'); expect(realtime.auth.clientId).to.equal(undefined); @@ -128,7 +128,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { var realtime; try { var keyStr = helper.getTestApp().keys[0].keyStr; - realtime = helper.AblyRealtimePromise({ + realtime = helper.AblyRealtime({ key: keyStr, useTokenAuth: true, defaultTokenParams: { clientId: '*', ttl: 123456 }, @@ -156,7 +156,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { var realtime; try { var keyStr = helper.getTestApp().keys[0].keyStr; - realtime = helper.AblyRealtimePromise({ + realtime = helper.AblyRealtime({ key: keyStr, useTokenAuth: true, defaultTokenParams: { clientId: 'test' }, @@ -182,7 +182,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { var realtime; try { var keyStr = helper.getTestApp().keys[0].keyStr; - realtime = helper.AblyRealtimePromise({ + realtime = helper.AblyRealtime({ key: keyStr, useTokenAuth: true, clientId: 'yes', @@ -235,7 +235,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { /* check changing the default timeouts */ it('init_timeouts', function (done) { try { - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ key: 'not_a.real:key', disconnectedRetryTimeout: 123, suspendedRetryTimeout: 456, @@ -268,7 +268,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { /* check changing the default fallback hosts and changing httpMaxRetryCount */ it('init_fallbacks', function (done) { try { - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ key: 'not_a.real:key', restHost: 'a', httpMaxRetryCount: 2, @@ -316,7 +316,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { it('node_transports', function (done) { var realtime; try { - realtime = helper.AblyRealtimePromise({ transports: helper.availableTransports }); + realtime = helper.AblyRealtime({ transports: helper.availableTransports }); expect(realtime.connection.connectionManager.baseTransport).to.equal('comet'); expect(realtime.connection.connectionManager.upgradeTransports).to.deep.equal(['web_socket']); closeAndFinish(done, realtime); @@ -331,7 +331,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { it('init_and_connection_details', function (done) { try { var keyStr = helper.getTestApp().keys[0].keyStr; - var realtime = helper.AblyRealtimePromise({ key: keyStr, useTokenAuth: true }); + var realtime = helper.AblyRealtime({ key: keyStr, useTokenAuth: true }); realtime.connection.connectionManager.once('transport.pending', function (state) { var transport = realtime.connection.connectionManager.pendingTransports[0], originalOnProtocolMessage = transport.onProtocolMessage; @@ -370,7 +370,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { }); it('init_fallbacks_once_connected', function (done) { - var realtime = helper.AblyRealtimePromise({ + var realtime = helper.AblyRealtime({ httpMaxRetryCount: 3, fallbackHosts: ['a', 'b', 'c'], }); @@ -390,8 +390,8 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { }); it('init_fallbacks_once_connected_2', function (done) { - var goodHost = helper.AblyRestPromise().options.realtimeHost; - var realtime = helper.AblyRealtimePromise({ + var goodHost = helper.AblyRest().options.realtimeHost; + var realtime = helper.AblyRealtime({ httpMaxRetryCount: 3, restHost: 'a', fallbackHosts: [goodHost, 'b', 'c'], diff --git a/test/realtime/message.test.js b/test/realtime/message.test.js index 623f1c0946..bcc4aa9128 100644 --- a/test/realtime/message.test.js +++ b/test/realtime/message.test.js @@ -39,8 +39,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('publishonce', function (done) { try { /* set up realtime */ - var realtime = helper.AblyRealtimePromise(); - var rest = helper.AblyRestPromise(); + var realtime = helper.AblyRealtime(); + var rest = helper.AblyRest(); /* connect and attach */ realtime.connection.on('connected', function () { @@ -80,7 +80,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async testOnAllTransports('publishfast', function (realtimeOpts) { return function (done) { try { - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); realtime.connection.once('connected', function () { var channel = realtime.channels.get('publishfast_' + String(Math.random()).substr(2)); whenPromiseSettles(channel.attach(), function (err) { @@ -144,8 +144,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return function (done) { var txRealtime, rxRealtime; try { - txRealtime = helper.AblyRealtimePromise(utils.mixin(realtimeOpts, { autoConnect: false })); - rxRealtime = helper.AblyRealtimePromise(); + txRealtime = helper.AblyRealtime(utils.mixin(realtimeOpts, { autoConnect: false })); + rxRealtime = helper.AblyRealtime(); var txChannel = txRealtime.channels.get('publishQueued_' + String(Math.random()).substr(2)); var rxChannel = rxRealtime.channels.get(txChannel.name); @@ -232,8 +232,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('publishEcho', function (done) { // set up two realtimes - var rtNoEcho = helper.AblyRealtimePromise({ echoMessages: false }), - rtEcho = helper.AblyRealtimePromise({ echoMessages: true }), + var rtNoEcho = helper.AblyRealtime({ echoMessages: false }), + rtEcho = helper.AblyRealtime({ echoMessages: true }), rtNoEchoChannel = rtNoEcho.channels.get('publishecho'), rtEchoChannel = rtEcho.channels.get('publishecho'), testMsg1 = 'Hello', @@ -323,8 +323,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async try { /* set up realtime */ - realtime = helper.AblyRealtimePromise(); - var rest = helper.AblyRestPromise(); + realtime = helper.AblyRealtime(); + var rest = helper.AblyRest(); /* connect and attach */ realtime.connection.on('connected', function () { @@ -429,8 +429,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async try { /* set up realtime */ - var realtime = helper.AblyRealtimePromise(); - var rest = helper.AblyRestPromise(); + var realtime = helper.AblyRealtime(); + var rest = helper.AblyRest(); /* connect and attach */ realtime.connection.on('connected', function () { @@ -483,8 +483,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async try { /* set up realtime */ - var realtime = helper.AblyRealtimePromise(); - var rest = helper.AblyRestPromise(); + var realtime = helper.AblyRealtime(); + var rest = helper.AblyRest(); /* connect and attach */ realtime.connection.on('connected', function () { @@ -565,8 +565,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('restpublish', function (done) { var count = 10; - var rest = helper.AblyRestPromise(); - var realtime = helper.AblyRealtimePromise(); + var rest = helper.AblyRest(); + var realtime = helper.AblyRealtime(); var messagesSent = []; var sendchannel = rest.channels.get('restpublish'); var recvchannel = realtime.channels.get('restpublish'); @@ -604,7 +604,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async --cbCount; checkFinish(); }; - var realtime = helper.AblyRealtimePromise(realtimeOpts); + var realtime = helper.AblyRealtime(realtimeOpts); var channel = realtime.channels.get('publish ' + JSON.stringify(realtimeOpts)); /* subscribe to event */ channel.subscribe( @@ -627,7 +627,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async and is implicitly added when published */ it('implicit_client_id_0', function (done) { var clientId = 'implicit_client_id_0', - realtime = helper.AblyRealtimePromise({ clientId: clientId }); + realtime = helper.AblyRealtime({ clientId: clientId }); realtime.connection.once('connected', function () { var transport = realtime.connection.connectionManager.activeProtocol.transport, @@ -666,7 +666,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('explicit_client_id_0', function (done) { var clientId = 'explicit_client_id_0', /* Use a fixed transport as intercepting transport.send */ - realtime = helper.AblyRealtimePromise({ clientId: clientId, transports: [helper.bestTransport] }); + realtime = helper.AblyRealtime({ clientId: clientId, transports: [helper.bestTransport] }); realtime.connection.once('connected', function () { var transport = realtime.connection.connectionManager.activeProtocol.transport, @@ -728,7 +728,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('explicit_client_id_1', function (done) { var clientId = 'explicit_client_id_1', invalidClientId = 'invalid', - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken({ clientId: clientId }), function (err, token) { if (err) { @@ -743,7 +743,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async } /* Use a fixed transport as intercepting transport.send */ - var realtime = helper.AblyRealtimePromise({ token: token.token, transports: [helper.bestTransport] }), + var realtime = helper.AblyRealtime({ token: token.token, transports: [helper.bestTransport] }), channel = realtime.channels.get('explicit_client_id_1'); // Publish before authentication to ensure the client library does not reject the message as the clientId is not known @@ -783,7 +783,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); it('subscribe_with_event_array', function (done) { - var realtime = helper.AblyRealtimePromise(), + var realtime = helper.AblyRealtime(), channel = realtime.channels.get('subscribe_with_event_array'); async.series( @@ -839,7 +839,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); it('subscribe_with_filter_object', function (done) { - const realtime = helper.AblyRealtimePromise(); + const realtime = helper.AblyRealtime(); const channel = realtime.channels.get('subscribe_with_filter_object'); function send(cb) { @@ -919,7 +919,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); it('unsubscribe_with_filter_object', function (done) { - const realtime = helper.AblyRealtimePromise(); + const realtime = helper.AblyRealtime(); const channel = realtime.channels.get('unsubscribe_with_filter_object'); function send(cb) { @@ -977,7 +977,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); it('extras_field', function (done) { - var realtime = helper.AblyRealtimePromise(), + var realtime = helper.AblyRealtime(), channel = realtime.channels.get('extras_field'), extras = { headers: { some: 'metadata' } }; @@ -1022,7 +1022,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* TO3l8; CD2C; RSL1i */ it('maxMessageSize', function (done) { - var realtime = helper.AblyRealtimePromise(), + var realtime = helper.AblyRealtime(), connectionManager = realtime.connection.connectionManager, channel = realtime.channels.get('maxMessageSize'); @@ -1056,7 +1056,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* RTL6d: publish a series of messages that exercise various bundling * constraints, check they're satisfied */ it.skip('bundling', function (done) { - var realtime = helper.AblyRealtimePromise({ maxMessageSize: 256, autoConnect: false }), + var realtime = helper.AblyRealtime({ maxMessageSize: 256, autoConnect: false }), channelOne = realtime.channels.get('bundlingOne'), channelTwo = realtime.channels.get('bundlingTwo'); @@ -1118,7 +1118,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); it('idempotentRealtimePublishing', function (done) { - var realtime = helper.AblyRealtimePromise(), + var realtime = helper.AblyRealtime(), channel = realtime.channels.get('idempotentRealtimePublishing'); whenPromiseSettles(channel.attach(), function (err) { @@ -1206,8 +1206,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async try { /* set up realtime */ - var realtime = helper.AblyRealtimePromise({ key: helper.getTestApp().keys[5].keyStr }); - var rest = helper.AblyRestPromise(); + var realtime = helper.AblyRealtime({ key: helper.getTestApp().keys[5].keyStr }); + var rest = helper.AblyRest(); realtime.connection.on('connected', function () { var rtFilteredChannel = realtime.channels.getDerived('chan', filterOption); diff --git a/test/realtime/presence.test.js b/test/realtime/presence.test.js index 4324c8f333..3ee5e48846 100644 --- a/test/realtime/presence.test.js +++ b/test/realtime/presence.test.js @@ -29,7 +29,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var createListenerChannel = function (channelName, callback) { var channel, realtime; try { - realtime = helper.AblyRealtimePromise(); + realtime = helper.AblyRealtime(); realtime.connection.on('connected', function () { channel = realtime.channels.get(channelName); whenPromiseSettles(channel.attach(), function (err) { @@ -101,7 +101,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async } // Create authTokens associated with specific clientIds try { - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); whenPromiseSettles(rest.auth.requestToken({ clientId: testClientId }), function (err, tokenDetails) { if (err) { done(err); @@ -143,7 +143,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var channelName = 'attachAndEnter'; var attachAndEnter = function (cb) { /* set up authenticated connection */ - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime.connection.on('connected', function () { /* get channel, attach, and enter */ var clientChannel = clientRealtime.channels.get(channelName); @@ -169,7 +169,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('presenceEnterWithoutAttach', function (done) { var channelName = 'enterWithoutAttach'; var enterWithoutAttach = function (cb) { - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime.connection.on('connected', function () { /* get channel, attach, and enter */ var clientChannel = clientRealtime.channels.get(channelName); @@ -189,7 +189,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('presenceEnterWithoutConnect', function (done) { var channelName = 'enterWithoutConnect'; var enterWithoutConnect = function (cb) { - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); var clientChannel = clientRealtime.channels.get(channelName); whenPromiseSettles(clientChannel.presence.enter('Test client data (enterWithoutConnect)'), function (err) { cb(err, clientRealtime); @@ -219,7 +219,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async return; } - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); listenerFor('enter', testClientId)(presenceChannel, function () { if (!raceFinished) { @@ -271,7 +271,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var channelName = 'enterWithCallback'; var enterWithCallback = function (cb) { /* set up authenticated connection */ - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime.connection.on('connected', function () { /* get channel, attach, and enter */ var clientChannel = clientRealtime.channels.get(channelName); @@ -297,7 +297,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('presenceEnterWithNothing', function (done) { var channelName = 'enterWithNothing'; var enterWithNothing = function (cb) { - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime.connection.on('connected', function () { /* get channel, attach, and enter */ var clientChannel = clientRealtime.channels.get(channelName); @@ -322,7 +322,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('presenceEnterWithData', function (done) { var channelName = 'enterWithData'; var enterWithData = function (cb) { - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime.connection.on('connected', function () { /* get channel, attach, and enter */ var clientChannel = clientRealtime.channels.get(channelName); @@ -346,7 +346,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * has valid action string */ it('presenceMessageAction', function (done) { - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); var channelName = 'presenceMessageAction'; var clientChannel = clientRealtime.channels.get(channelName); var presence = clientChannel.presence; @@ -386,7 +386,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async channel.presence.subscribe(presenceHandler); }; var enterDetachEnter = function (cb) { - var clientRealtime = helper.AblyRealtimePromise({ + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken, transports: [helper.bestTransport], @@ -421,7 +421,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('presenceEnterInvalid', function (done) { var clientRealtime; try { - clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); var clientChannel = clientRealtime.channels.get(''); clientRealtime.connection.once('connected', function () { whenPromiseSettles(clientChannel.presence.enter('clientId'), function (err) { @@ -450,7 +450,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('presenceEnterAndLeave', function (done) { var channelName = 'enterAndLeave'; var enterAndLeave = function (cb) { - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime.connection.on('connected', function () { /* get channel, attach, and enter */ var clientChannel = clientRealtime.channels.get(channelName); @@ -499,7 +499,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async channel.presence.subscribe(presenceHandler); }; var enterUpdate = function (cb) { - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime.connection.on('connected', function () { var clientChannel = clientRealtime.channels.get(channelName); whenPromiseSettles(clientChannel.attach(), function (err) { @@ -552,7 +552,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async channel.presence.subscribe(presenceHandler); }; var enterGet = function (cb) { - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime.connection.on('connected', function () { /* get channel, attach, and enter */ var clientChannel = clientRealtime.channels.get(channelName); @@ -577,7 +577,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('presenceSubscribeUnattached', function (done) { var channelName = 'subscribeUnattached'; - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); var clientRealtime2; clientRealtime.connection.on('connected', function () { var clientChannel = clientRealtime.channels.get(channelName); @@ -591,7 +591,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async closeAndFinish(done, [clientRealtime, clientRealtime2]); }); /* Technically a race, but c2 connecting and attaching should take longer than c1 attaching */ - clientRealtime2 = helper.AblyRealtimePromise({ clientId: testClientId2, tokenDetails: authToken2 }); + clientRealtime2 = helper.AblyRealtime({ clientId: testClientId2, tokenDetails: authToken2 }); clientRealtime2.connection.on('connected', function () { var clientChannel2 = clientRealtime2.channels.get(channelName); clientChannel2.presence.enter('data'); @@ -606,7 +606,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('presenceGetUnattached', function (done) { var channelName = 'getUnattached'; var testData = 'some data'; - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime.connection.on('connected', function () { /* get channel, attach, and enter */ var clientChannel = clientRealtime.channels.get(channelName); @@ -615,7 +615,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async closeAndFinish(done, clientRealtime, err); return; } - var clientRealtime2 = helper.AblyRealtimePromise({ clientId: testClientId2, tokenDetails: authToken2 }); + var clientRealtime2 = helper.AblyRealtime({ clientId: testClientId2, tokenDetails: authToken2 }); clientRealtime2.connection.on('connected', function () { var clientChannel2 = clientRealtime2.channels.get(channelName); /* GET without attaching */ @@ -669,7 +669,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async channel.presence.subscribe(presenceHandler); }; var enterLeaveGet = function (cb) { - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime.connection.on('connected', function () { /* get channel, attach, and enter */ var clientChannel = clientRealtime.channels.get(channelName); @@ -726,7 +726,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }; try { /* set up authenticated connection */ - clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime.connection.on('connected', function () { /* get channel, attach, and enter */ var clientChannel = clientRealtime.channels.get(channelName); @@ -775,7 +775,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var channelName = 'secondConnection'; try { /* set up authenticated connection */ - clientRealtime1 = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + clientRealtime1 = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime1.connection.on('connected', function () { /* get channel, attach, and enter */ var clientChannel1 = clientRealtime1.channels.get(channelName); @@ -804,7 +804,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async } /* now set up second connection and attach */ /* set up authenticated connection */ - clientRealtime2 = helper.AblyRealtimePromise({ clientId: testClientId2, tokenDetails: authToken2 }); + clientRealtime2 = helper.AblyRealtime({ clientId: testClientId2, tokenDetails: authToken2 }); clientRealtime2.connection.on('connected', function () { /* get channel, attach */ var clientChannel2 = clientRealtime2.channels.get(channelName); @@ -859,7 +859,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async [ function (cb1) { var data = 'Test client data (member0-1)'; - clientRealtime1 = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + clientRealtime1 = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); clientRealtime1.connection.on('connected', function () { /* get channel, attach, and enter */ clientChannel1 = clientRealtime1.channels.get(channelName); @@ -881,7 +881,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }, function (cb2) { var data = 'Test client data (member0-2)'; - clientRealtime2 = helper.AblyRealtimePromise({ clientId: testClientId2, tokenDetails: authToken2 }); + clientRealtime2 = helper.AblyRealtime({ clientId: testClientId2, tokenDetails: authToken2 }); clientRealtime2.connection.on('connected', function () { /* get channel, attach */ clientChannel2 = clientRealtime2.channels.get(channelName); @@ -1025,7 +1025,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async channel.presence.subscribe(presenceHandler); }; var enterAfterClose = function (cb) { - var clientRealtime = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); + var clientRealtime = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); var clientChannel = clientRealtime.channels.get(channelName); clientRealtime.connection.once('connected', function () { /* get channel and enter (should automatically attach) */ @@ -1059,7 +1059,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var clientRealtime; var channelName = 'enterClosed'; try { - clientRealtime = helper.AblyRealtimePromise(); + clientRealtime = helper.AblyRealtime(); var clientChannel = clientRealtime.channels.get(channelName); clientRealtime.connection.on('connected', function () { clientRealtime.close(); @@ -1085,7 +1085,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('presenceClientIdIsImplicit', function (done) { var clientId = 'implicitClient', - client = helper.AblyRealtimePromise({ clientId: clientId }); + client = helper.AblyRealtime({ clientId: clientId }); var channel = client.channels.get('presenceClientIdIsImplicit'), presence = channel.presence; @@ -1135,8 +1135,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async transports: [helper.bestTransport], }; - var realtimeBin = helper.AblyRealtimePromise(utils.mixin(options, { useBinaryProtocol: true })); - var realtimeJson = helper.AblyRealtimePromise(utils.mixin(options, { useBinaryProtocol: false })); + var realtimeBin = helper.AblyRealtime(utils.mixin(options, { useBinaryProtocol: true })); + var realtimeJson = helper.AblyRealtime(utils.mixin(options, { useBinaryProtocol: false })); var runTest = function (realtime, callback) { realtime.connection.connectionManager.once('transport.active', function (transport) { @@ -1202,7 +1202,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }; var enterInheritedClientId = function (cb) { - var realtime = helper.AblyRealtimePromise({ authCallback: authCallback }); + var realtime = helper.AblyRealtime({ authCallback: authCallback }); var channel = realtime.channels.get(channelName); realtime.connection.on('connected', function () { try { @@ -1235,7 +1235,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async done(err); return; } - var realtime = helper.AblyRealtimePromise({ token: tokenDetails.token, autoConnect: false }); + var realtime = helper.AblyRealtime({ token: tokenDetails.token, autoConnect: false }); var channel = realtime.channels.get(channelName); try { expect(realtime.auth.clientId).to.equal(undefined, 'no clientId when entering'); @@ -1266,8 +1266,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async */ it('presence_refresh_on_detach', function (done) { var channelName = 'presence_refresh_on_detach'; - var realtime = helper.AblyRealtimePromise(); - var observer = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); + var observer = helper.AblyRealtime(); var realtimeChannel = realtime.channels.get(channelName); var observerChannel = observer.channels.get(channelName); @@ -1380,8 +1380,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('presence_detach_during_sync', function (done) { var channelName = 'presence_detach_during_sync'; - var enterer = helper.AblyRealtimePromise({ clientId: testClientId, tokenDetails: authToken }); - var detacher = helper.AblyRealtimePromise(); + var enterer = helper.AblyRealtime({ clientId: testClientId, tokenDetails: authToken }); + var detacher = helper.AblyRealtime(); var entererChannel = enterer.channels.get(channelName); var detacherChannel = detacher.channels.get(channelName); @@ -1436,7 +1436,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * presence set */ it('presence_auto_reenter', function (done) { var channelName = 'presence_auto_reenter'; - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); var channel = realtime.channels.get(channelName); async.series( @@ -1561,7 +1561,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); }, function (cb) { - realtime = helper.AblyRealtimePromise({ tokenDetails: token }); + realtime = helper.AblyRealtime({ tokenDetails: token }); channel = realtime.channels.get(channelName); realtime.connection.once('connected', function () { cb(); @@ -1640,7 +1640,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* Enter ten clients while attaching, finish the attach, check they were all entered correctly */ it('multiple_pending', function (done) { /* single transport to avoid upgrade stalling due to the stubbed attachImpl */ - var realtime = helper.AblyRealtimePromise({ transports: [helper.bestTransport] }), + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport] }), channel = realtime.channels.get('multiple_pending'), originalAttachImpl = channel.attachImpl; @@ -1692,10 +1692,10 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * Check that a LEAVE message is published for anyone in the local presence * set but missing from a sync */ it('leave_published_for_member_missing_from_sync', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: helper.availableTransports }), + var realtime = helper.AblyRealtime({ transports: helper.availableTransports }), continuousClientId = 'continuous', goneClientId = 'gone', - continuousRealtime = helper.AblyRealtimePromise({ clientId: continuousClientId }), + continuousRealtime = helper.AblyRealtime({ clientId: continuousClientId }), channelName = 'leave_published_for_member_missing_from_sync', channel = realtime.channels.get(channelName), continuousChannel = continuousRealtime.channels.get(channelName); @@ -1807,7 +1807,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * Check that a LEAVE message is published for anyone in the local presence * set if get an ATTACHED with no HAS_PRESENCE */ it('leave_published_for_members_on_presenceless_attached', function (done) { - var realtime = helper.AblyRealtimePromise(), + var realtime = helper.AblyRealtime(), channelName = 'leave_published_for_members_on_presenceless_attached', channel = realtime.channels.get(channelName), fakeClientId = 'faker'; @@ -1899,9 +1899,9 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * and only members that changed between ATTACHED states should result in * presence events */ it('suspended_preserves_presence', function (done) { - var mainRealtime = helper.AblyRealtimePromise({ clientId: 'main', logLevel: 4 }), - continuousRealtime = helper.AblyRealtimePromise({ clientId: 'continuous', logLevel: 4 }), - leavesRealtime = helper.AblyRealtimePromise({ clientId: 'leaves', logLevel: 4 }), + var mainRealtime = helper.AblyRealtime({ clientId: 'main', logLevel: 4 }), + continuousRealtime = helper.AblyRealtime({ clientId: 'continuous', logLevel: 4 }), + leavesRealtime = helper.AblyRealtime({ clientId: 'leaves', logLevel: 4 }), channelName = 'suspended_preserves_presence', mainChannel = mainRealtime.channels.get(channelName); @@ -2037,7 +2037,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * comparisons. */ it('presence_many_updates', function (done) { - var client = helper.AblyRealtimePromise({ clientId: testClientId }); + var client = helper.AblyRealtime({ clientId: testClientId }); var channel = client.channels.get('presence_many_updates'), presence = channel.presence, diff --git a/test/realtime/reauth.test.js b/test/realtime/reauth.test.js index 87b44ab77d..137d35a9b2 100644 --- a/test/realtime/reauth.test.js +++ b/test/realtime/reauth.test.js @@ -17,7 +17,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { done(err); return; } - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); done(); }); }); @@ -44,7 +44,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { function connectWithToken() { return function (state, callback) { - var realtime = helper.AblyRealtimePromise(mixin({ token: state.token }, state.realtimeOpts)); + var realtime = helper.AblyRealtime(mixin({ token: state.token }, state.realtimeOpts)); realtime.connection.once('connected', function () { callback(null, mixin(state, { realtime: realtime })); }); diff --git a/test/realtime/resume.test.js b/test/realtime/resume.test.js index 1c0e96ce32..26104d9aa2 100644 --- a/test/realtime/resume.test.js +++ b/test/realtime/resume.test.js @@ -44,8 +44,8 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { function resume_inactive(done, channelName, txOpts, rxOpts) { var count = 5; - var txRest = helper.AblyRestPromise(mixin(txOpts)); - var rxRealtime = helper.AblyRealtimePromise(mixin(rxOpts)); + var txRest = helper.AblyRest(mixin(txOpts)); + var rxRealtime = helper.AblyRealtime(mixin(rxOpts)); var rxChannel = rxRealtime.channels.get(channelName); var txChannel = txRest.channels.get(channelName); @@ -155,8 +155,8 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { function resume_active(done, channelName, txOpts, rxOpts) { var count = 5; - var txRest = helper.AblyRestPromise(mixin(txOpts)); - var rxRealtime = helper.AblyRealtimePromise(mixin(rxOpts)); + var txRest = helper.AblyRest(mixin(txOpts)); + var rxRealtime = helper.AblyRealtime(mixin(rxOpts)); var rxChannel = rxRealtime.channels.get(channelName); var txChannel = txRest.channels.get(channelName); @@ -276,7 +276,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { 'resume_lost_continuity', function (realtimeOpts) { return function (done) { - var realtime = helper.AblyRealtimePromise(realtimeOpts), + var realtime = helper.AblyRealtime(realtimeOpts), connection = realtime.connection, attachedChannelName = 'resume_lost_continuity_attached', suspendedChannelName = 'resume_lost_continuity_suspended', @@ -342,7 +342,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { 'resume_token_error', function (realtimeOpts) { return function (done) { - var realtime = helper.AblyRealtimePromise(mixin(realtimeOpts, { useTokenAuth: true })), + var realtime = helper.AblyRealtime(mixin(realtimeOpts, { useTokenAuth: true })), badtoken, connection = realtime.connection; @@ -395,7 +395,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { 'resume_fatal_error', function (realtimeOpts) { return function (done) { - var realtime = helper.AblyRealtimePromise(realtimeOpts), + var realtime = helper.AblyRealtime(realtimeOpts), connection = realtime.connection; async.series( @@ -445,7 +445,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { * TODO: enable once realtime supports this */ it('channel_resumed_flag', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: [helper.bestTransport] }), + var realtime = helper.AblyRealtime({ transports: [helper.bestTransport] }), realtimeTwo, recoveryKey, connection = realtime.connection, @@ -476,7 +476,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { helper.becomeSuspended(realtime, cb); }, function (cb) { - realtimeTwo = helper.AblyRealtimePromise({ recover: recoveryKey }); + realtimeTwo = helper.AblyRealtime({ recover: recoveryKey }); realtimeTwo.connection.once('connected', function (stateChange) { if (stateChange.reason) { cb(stateChange.reason); @@ -509,7 +509,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { * Check the library doesn't try to resume once the connectionStateTtl has expired */ it('no_resume_once_suspended', function (done) { - var realtime = helper.AblyRealtimePromise(), + var realtime = helper.AblyRealtime(), connection = realtime.connection, channelName = 'no_resume_once_suspended'; @@ -548,7 +548,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { */ it('no_resume_last_activity', function (done) { /* Specify a best transport so that upgrade activity doesn't reset the last activity timer */ - var realtime = helper.AblyRealtimePromise({ transports: [bestTransport] }), + var realtime = helper.AblyRealtime({ transports: [bestTransport] }), connection = realtime.connection, connectionManager = connection.connectionManager; @@ -574,11 +574,11 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { var testName = 'resume_rewind_1'; var testMessage = { foo: 'bar', count: 1, status: 'active' }; try { - var sender_realtime = helper.AblyRealtimePromise(); + var sender_realtime = helper.AblyRealtime(); var sender_channel = sender_realtime.channels.get(testName); sender_channel.subscribe(function (message) { - var receiver_realtime = helper.AblyRealtimePromise(); + var receiver_realtime = helper.AblyRealtime(); var receiver_channel = receiver_realtime.channels.get(testName, { params: { rewind: 1 } }); receiver_channel.subscribe(function (message) { @@ -592,7 +592,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { return; } - var resumed_receiver_realtime = helper.AblyRealtimePromise(); + var resumed_receiver_realtime = helper.AblyRealtime(); var connectionManager = resumed_receiver_realtime.connection.connectionManager; var sendOrig = connectionManager.send; @@ -630,8 +630,8 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { it('recover multiple channels', function (done) { const NUM_MSGS = 5; - const txRest = helper.AblyRestPromise(); - const rxRealtime = helper.AblyRealtimePromise( + const txRest = helper.AblyRest(); + const rxRealtime = helper.AblyRealtime( { transports: [helper.bestTransport], }, @@ -739,7 +739,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { return; } - rxRealtimeRecover = helper.AblyRealtimePromise({ recover: recoveryKey }); + rxRealtimeRecover = helper.AblyRealtime({ recover: recoveryKey }); rxRecoverChannels = channelNames.map((name) => rxRealtimeRecover.channels.get(name)); subscribeRecoveredMessages(function (err) { diff --git a/test/realtime/sync.test.js b/test/realtime/sync.test.js index 2359fd830e..3c306d9bcc 100644 --- a/test/realtime/sync.test.js +++ b/test/realtime/sync.test.js @@ -44,7 +44,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * different presence set */ it('sync_existing_set', async function () { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), channelName = 'syncexistingset', channel = realtime.channels.get(channelName); @@ -164,7 +164,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * middle of the sync should should discard the former, but not the latter * */ it('sync_member_arrives_in_middle', async function () { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), channelName = 'sync_member_arrives_in_middle', channel = realtime.channels.get(channelName); @@ -266,7 +266,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * Presence message that was in the sync arrives again as a normal message, after it's come in the sync */ it('sync_member_arrives_normally_after_came_in_sync', async function () { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), channelName = 'sync_member_arrives_normally_after_came_in_sync', channel = realtime.channels.get(channelName); @@ -349,7 +349,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * Presence message that will be in the sync arrives as a normal message, before it comes in the sync */ it('sync_member_arrives_normally_before_comes_in_sync', async function () { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), channelName = 'sync_member_arrives_normally_before_comes_in_sync', channel = realtime.channels.get(channelName); @@ -433,7 +433,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async * index, and synthesized leaves, check that the end result is correct */ it('presence_ordering', async function () { - var realtime = helper.AblyRealtimePromise({ autoConnect: false }), + var realtime = helper.AblyRealtime({ autoConnect: false }), channelName = 'sync_ordering', channel = realtime.channels.get(channelName); @@ -589,8 +589,8 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('presence_sync_interruptus', function (done) { var channelName = 'presence_sync_interruptus'; var interrupterClientId = 'dark_horse'; - var enterer = helper.AblyRealtimePromise(); - var syncer = helper.AblyRealtimePromise(); + var enterer = helper.AblyRealtime(); + var syncer = helper.AblyRealtime(); var entererChannel = enterer.channels.get(channelName); var syncerChannel = syncer.channels.get(channelName); diff --git a/test/realtime/upgrade.test.js b/test/realtime/upgrade.test.js index 674035ad47..3ae14f839c 100644 --- a/test/realtime/upgrade.test.js +++ b/test/realtime/upgrade.test.js @@ -30,7 +30,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai done(err); return; } - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); done(); }); }); @@ -43,7 +43,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai it('publishpreupgrade', function (done) { var transportOpts = { useBinaryProtocol: true, transports: helper.availableTransports }; try { - var realtime = helper.AblyRealtimePromise(transportOpts); + var realtime = helper.AblyRealtime(transportOpts); /* connect and attach */ realtime.connection.on('connected', function () { //console.log('publishpreupgrade: connected'); @@ -87,7 +87,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai it('publishpostupgrade0', function (done) { var transportOpts = { useBinaryProtocol: true, transports: helper.availableTransports }; try { - var realtime = helper.AblyRealtimePromise(transportOpts); + var realtime = helper.AblyRealtime(transportOpts); /* subscribe to event */ var rtChannel = realtime.channels.get('publishpostupgrade0'); @@ -145,7 +145,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai it('publishpostupgrade1', function (done) { var transportOpts = { useBinaryProtocol: true, transports: helper.availableTransports }; try { - var realtime = helper.AblyRealtimePromise(transportOpts); + var realtime = helper.AblyRealtime(transportOpts); /* subscribe to event */ var rtChannel = realtime.channels.get('publishpostupgrade1'); @@ -220,7 +220,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai checkFinish(); }; var transportOpts = { useBinaryProtocol: false, transports: helper.availableTransports }; - var realtime = helper.AblyRealtimePromise(transportOpts); + var realtime = helper.AblyRealtime(transportOpts); var channel = realtime.channels.get('upgradepublish0'); /* subscribe to event */ channel.subscribe( @@ -254,7 +254,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai checkFinish(); }; var transportOpts = { useBinaryProtocol: true, transports: helper.availableTransports }; - var realtime = helper.AblyRealtimePromise(transportOpts); + var realtime = helper.AblyRealtime(transportOpts); var channel = realtime.channels.get('upgradepublish1'); /* subscribe to event */ channel.subscribe( @@ -279,7 +279,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai var transportOpts = { useBinaryProtocol: true, transports: helper.availableTransports }; var cometDeactivated = false; try { - var realtime = helper.AblyRealtimePromise(transportOpts); + var realtime = helper.AblyRealtime(transportOpts); /* check that we see the transport we're interested in get activated, * and that we see the comet transport deactivated */ var failTimer = setTimeout(function () { @@ -321,7 +321,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai it('upgradeheartbeat0', function (done) { var transportOpts = { useBinaryProtocol: false, transports: helper.availableTransports }; try { - var realtime = helper.AblyRealtimePromise(transportOpts); + var realtime = helper.AblyRealtime(transportOpts); /* when we see the transport we're interested in get activated, * listen for the heartbeat event */ @@ -354,7 +354,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai it('upgradeheartbeat1', function (done) { var transportOpts = { useBinaryProtocol: true, transports: helper.availableTransports }; try { - var realtime = helper.AblyRealtimePromise(transportOpts); + var realtime = helper.AblyRealtime(transportOpts); /* when we see the transport we're interested in get activated, * listen for the heartbeat event */ @@ -387,7 +387,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai it('upgradeheartbeat2', function (done) { var transportOpts = { useBinaryProtocol: false, transports: helper.availableTransports }; try { - var realtime = helper.AblyRealtimePromise(transportOpts); + var realtime = helper.AblyRealtime(transportOpts); /* when we see the transport we're interested in get activated, * listen for the heartbeat event */ @@ -433,7 +433,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai it('upgradeheartbeat3', function (done) { var transportOpts = { useBinaryProtocol: true, transports: helper.availableTransports }; try { - var realtime = helper.AblyRealtimePromise(transportOpts); + var realtime = helper.AblyRealtime(transportOpts); /* when we see the transport we're interested in get activated, * listen for the heartbeat event */ @@ -480,7 +480,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai try { /* on base transport active */ - realtime = helper.AblyRealtimePromise({ transports: helper.availableTransports }); + realtime = helper.AblyRealtime({ transports: helper.availableTransports }); realtime.connection.connectionManager.once('transport.active', function (transport) { expect( transport.toString().indexOf('/comet/') > -1, @@ -535,7 +535,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai * seamlessly transferred to the websocket transport and published there */ it('message_timeout_stalling_upgrade', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: helper.availableTransports, httpRequestTimeout: 3000 }), + var realtime = helper.AblyRealtime({ transports: helper.availableTransports, httpRequestTimeout: 3000 }), channel = realtime.channels.get('timeout1'), connectionManager = realtime.connection.connectionManager; @@ -581,7 +581,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai * and subsequent connections do not upgrade */ it('persist_transport_prefs', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: helper.availableTransports }), + var realtime = helper.AblyRealtime({ transports: helper.availableTransports }), connection = realtime.connection, connectionManager = connection.connectionManager; @@ -643,7 +643,7 @@ define(['shared_helper', 'async', 'chai', 'ably'], function (helper, async, chai * Check that upgrades succeed even if the original transport dies before the sync */ it('upgrade_original_transport_dies', function (done) { - var realtime = helper.AblyRealtimePromise({ transports: helper.availableTransports }), + var realtime = helper.AblyRealtime({ transports: helper.availableTransports }), connection = realtime.connection, connectionManager = connection.connectionManager; diff --git a/test/rest/auth.test.js b/test/rest/auth.test.js index e1a9825be1..c1aed009bd 100644 --- a/test/rest/auth.test.js +++ b/test/rest/auth.test.js @@ -12,7 +12,7 @@ define(['chai', 'shared_helper', 'async', 'globals'], function (chai, helper, as before(function (done) { helper.setupApp(function () { - rest = helper.AblyRestPromise({ queryTime: true }); + rest = helper.AblyRest({ queryTime: true }); rest .time() .then(function (time) { @@ -46,7 +46,7 @@ define(['chai', 'shared_helper', 'async', 'globals'], function (chai, helper, as it('Generate token and init library with it', async function () { var tokenDetails = await rest.auth.requestToken(); expect(tokenDetails.token, 'Verify token value').to.be.ok; - helper.AblyRestPromise({ token: tokenDetails.token }); + helper.AblyRest({ token: tokenDetails.token }); }); it('Token generation with explicit timestamp', async function () { @@ -179,7 +179,7 @@ define(['chai', 'shared_helper', 'async', 'globals'], function (chai, helper, as }); it('Token generation with defaultTokenParams set and no tokenParams passed in', async function () { - var rest1 = helper.AblyRestPromise({ defaultTokenParams: { ttl: 123, clientId: 'foo' } }); + var rest1 = helper.AblyRest({ defaultTokenParams: { ttl: 123, clientId: 'foo' } }); var tokenDetails = await rest1.auth.requestToken(); expect(tokenDetails.token, 'Verify token value').to.be.ok; expect(tokenDetails.clientId).to.equal('foo', 'Verify client id from defaultTokenParams used'); @@ -187,7 +187,7 @@ define(['chai', 'shared_helper', 'async', 'globals'], function (chai, helper, as }); it('Token generation: if tokenParams passed in, defaultTokenParams should be ignored altogether, not merged', async function () { - var rest1 = helper.AblyRestPromise({ defaultTokenParams: { ttl: 123, clientId: 'foo' } }); + var rest1 = helper.AblyRest({ defaultTokenParams: { ttl: 123, clientId: 'foo' } }); var tokenDetails = await rest1.auth.requestToken({ clientId: 'bar' }, null); expect(tokenDetails.clientId).to.equal( 'bar', @@ -289,10 +289,10 @@ define(['chai', 'shared_helper', 'async', 'globals'], function (chai, helper, as var keys = { keyName: currentKey.keyName, keySecret: currentKey.keySecret }; var authParams = utils.mixin(keys, params); var authUrl = echoServer + '/createJWT' + utils.toQueryString(authParams); - var restJWTRequester = helper.AblyRestPromise({ authUrl: authUrl }); + var restJWTRequester = helper.AblyRest({ authUrl: authUrl }); var tokenDetails = await restJWTRequester.auth.requestToken(); - var restClient = helper.AblyRestPromise({ token: tokenDetails.token }); + var restClient = helper.AblyRest({ token: tokenDetails.token }); await restClient.stats(); }); } @@ -315,10 +315,10 @@ define(['chai', 'shared_helper', 'async', 'globals'], function (chai, helper, as it('JWT request with invalid key', async function () { var keys = { keyName: 'invalid.invalid', keySecret: 'invalidinvalid' }; var authUrl = echoServer + '/createJWT' + utils.toQueryString(keys); - var restJWTRequester = helper.AblyRestPromise({ authUrl: authUrl }); + var restJWTRequester = helper.AblyRest({ authUrl: authUrl }); var tokenDetails = await restJWTRequester.auth.requestToken(); - var restClient = helper.AblyRestPromise({ token: tokenDetails.token }); + var restClient = helper.AblyRest({ token: tokenDetails.token }); try { var stats = await restClient.stats(); } catch (err) { @@ -336,7 +336,7 @@ define(['chai', 'shared_helper', 'async', 'globals'], function (chai, helper, as var currentKey = helper.getTestApp().keys[0]; var keys = { keyName: currentKey.keyName, keySecret: currentKey.keySecret }; var authUrl = echoServer + '/createJWT' + utils.toQueryString(keys); - var restJWTRequester = helper.AblyRestPromise({ authUrl: authUrl }); + var restJWTRequester = helper.AblyRest({ authUrl: authUrl }); var authCallback = function (tokenParams, callback) { restJWTRequester.auth.requestToken().then(function (tokenDetails) { @@ -344,7 +344,7 @@ define(['chai', 'shared_helper', 'async', 'globals'], function (chai, helper, as }); }; - var restClient = helper.AblyRestPromise({ authCallback: authCallback }); + var restClient = helper.AblyRest({ authCallback: authCallback }); var stats = await restClient.stats(); }); @@ -354,7 +354,7 @@ define(['chai', 'shared_helper', 'async', 'globals'], function (chai, helper, as it('Rest JWT with authCallback and invalid keys', async function () { var keys = { keyName: 'invalid.invalid', keySecret: 'invalidinvalid' }; var authUrl = echoServer + '/createJWT' + utils.toQueryString(keys); - var restJWTRequester = helper.AblyRestPromise({ authUrl: authUrl }); + var restJWTRequester = helper.AblyRest({ authUrl: authUrl }); var authCallback = function (tokenParams, callback) { restJWTRequester.auth.requestToken().then(function (tokenDetails) { @@ -362,7 +362,7 @@ define(['chai', 'shared_helper', 'async', 'globals'], function (chai, helper, as }); }; - var restClient = helper.AblyRestPromise({ authCallback: authCallback }); + var restClient = helper.AblyRest({ authCallback: authCallback }); try { await restClient.stats(); } catch (err) { @@ -383,7 +383,7 @@ define(['chai', 'shared_helper', 'async', 'globals'], function (chai, helper, as } /* Example client-side using the token */ - var restClient = helper.AblyRestPromise({ authCallback: authCallback }); + var restClient = helper.AblyRest({ authCallback: authCallback }); var channel = restClient.channels.get('auth_concurrent'); await Promise.all([channel.history(), channel.history()]); diff --git a/test/rest/capability.test.js b/test/rest/capability.test.js index 0c88b94bfc..6684cce8b4 100644 --- a/test/rest/capability.test.js +++ b/test/rest/capability.test.js @@ -20,7 +20,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { before(function (done) { helper.setupApp(function () { - rest = helper.AblyRestPromise({ queryTime: true }); + rest = helper.AblyRest({ queryTime: true }); testApp = helper.getTestApp(); rest .time() diff --git a/test/rest/fallbacks.test.js b/test/rest/fallbacks.test.js index df716ecede..209b519291 100644 --- a/test/rest/fallbacks.test.js +++ b/test/rest/fallbacks.test.js @@ -14,14 +14,14 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { done(err); return; } - goodHost = helper.AblyRestPromise().options.restHost; + goodHost = helper.AblyRest().options.restHost; done(); }); }); /* RSC15f */ it('Store working fallback', async function () { - var rest = helper.AblyRestPromise({ + var rest = helper.AblyRest({ restHost: helper.unroutableHost, fallbackHosts: [goodHost], httpRequestTimeout: 3000, diff --git a/test/rest/history.test.js b/test/rest/history.test.js index 98eab3e5ab..34b7778445 100644 --- a/test/rest/history.test.js +++ b/test/rest/history.test.js @@ -22,7 +22,7 @@ define(['shared_helper', 'async', 'chai'], function (helper, async, chai) { before(function (done) { helper.setupApp(function () { - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); done(); }); }); diff --git a/test/rest/http.test.js b/test/rest/http.test.js index ff363d3b19..315f751551 100644 --- a/test/rest/http.test.js +++ b/test/rest/http.test.js @@ -9,7 +9,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { this.timeout(60 * 1000); before(function (done) { helper.setupApp(function () { - rest = helper.AblyRestPromise({ + rest = helper.AblyRest({ agents: { 'custom-agent': '0.1.2', }, diff --git a/test/rest/init.test.js b/test/rest/init.test.js index 11f9b5a11d..f4debf54f4 100644 --- a/test/rest/init.test.js +++ b/test/rest/init.test.js @@ -25,7 +25,7 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { it('Init with token string', async function () { /* first generate a token ... */ - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); var testKeyOpts = { key: helper.getTestApp().keys[1].keyStr }; var tokenDetails = await rest.auth.requestToken(null, testKeyOpts); @@ -36,30 +36,30 @@ define(['ably', 'shared_helper', 'chai'], function (Ably, helper, chai) { }); it('Init with tls: false', function () { - var rest = helper.AblyRestPromise({ tls: false, port: 123, tlsPort: 456 }); + var rest = helper.AblyRest({ tls: false, port: 123, tlsPort: 456 }); expect(rest.baseUri('example.com')).to.equal('http://example.com:123'); }); it('Init with tls: true', function () { - var rest = helper.AblyRestPromise({ tls: true, port: 123, tlsPort: 456 }); + var rest = helper.AblyRest({ tls: true, port: 123, tlsPort: 456 }); expect(rest.baseUri('example.com')).to.equal('https://example.com:456'); }); /* init without any tls key should enable tls */ it('Init without any tls key should enable tls', function () { - var rest = helper.AblyRestPromise({ port: 123, tlsPort: 456 }); + var rest = helper.AblyRest({ port: 123, tlsPort: 456 }); expect(rest.baseUri('example.com')).to.equal('https://example.com:456'); }); it("Init with clientId set to '*' or anything other than a string or null should error", function () { expect(function () { - var rest = helper.AblyRestPromise({ clientId: '*' }); + var rest = helper.AblyRest({ clientId: '*' }); }, 'Check can’t init library with a wildcard clientId').to.throw; expect(function () { - var rest = helper.AblyRestPromise({ clientId: 123 }); + var rest = helper.AblyRest({ clientId: 123 }); }, 'Check can’t init library with a numerical clientId').to.throw; expect(function () { - var rest = helper.AblyRestPromise({ clientId: false }); + var rest = helper.AblyRest({ clientId: false }); }, 'Check can’t init library with a boolean clientId').to.throw; }); diff --git a/test/rest/message.test.js b/test/rest/message.test.js index bb62a52791..389e0b7d74 100644 --- a/test/rest/message.test.js +++ b/test/rest/message.test.js @@ -20,7 +20,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async and is implicitly added when published */ it('Should implicitly send clientId when authenticated with clientId', async function () { var clientId = 'implicit_client_id_0', - rest = helper.AblyRestPromise({ clientId: clientId, useBinaryProtocol: false }), + rest = helper.AblyRest({ clientId: clientId, useBinaryProtocol: false }), channel = rest.channels.get('rest_implicit_client_id_0'); var originalPublish = channel._publish; @@ -42,7 +42,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async and ensure it is published */ it('Should publish clientId when provided explicitly in message', async function () { var clientId = 'explicit_client_id_0', - rest = helper.AblyRestPromise({ clientId: clientId, useBinaryProtocol: false }), + rest = helper.AblyRest({ clientId: clientId, useBinaryProtocol: false }), channel = rest.channels.get('rest_explicit_client_id_0'); var originalPublish = channel._publish; @@ -68,11 +68,11 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async var clientId = 'explicit_client_id_0', invalidClientId = 'invalid'; - var token = await helper.AblyRestPromise().auth.requestToken({ clientId: clientId }); + var token = await helper.AblyRest().auth.requestToken({ clientId: clientId }); expect(token.clientId === clientId, 'client ID is present in the Token').to.be.ok; // REST client uses a token string so is unaware of the clientId so cannot reject before communicating with Ably - var rest = helper.AblyRestPromise({ token: token.token, useBinaryProtocol: false }), + var rest = helper.AblyRest({ token: token.token, useBinaryProtocol: false }), channel = rest.channels.get('rest_explicit_client_id_1'); var originalPublish = channel._publish; @@ -99,7 +99,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* TO3l8; CD2C; RSL1i */ it('Should error when publishing message larger than maxMessageSize', async function () { /* No connectionDetails mechanism for REST, so just pass the override into the constructor */ - var realtime = helper.AblyRestPromise({ internal: { maxMessageSize: 64 } }), + var realtime = helper.AblyRest({ internal: { maxMessageSize: 64 } }), channel = realtime.channels.get('maxMessageSize'); try { @@ -114,7 +114,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* Check ids are correctly sent */ it('Should send correct IDs when idempotentRestPublishing set to false', async function () { - var rest = helper.AblyRestPromise({ idempotentRestPublishing: false, useBinaryProtocol: false }), + var rest = helper.AblyRest({ idempotentRestPublishing: false, useBinaryProtocol: false }), channel = rest.channels.get('idempotent_rest_publishing'), message = { name: 'test', id: 'idempotent-msg-id:0' }; @@ -128,11 +128,11 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* Check ids are added when automatic idempotent rest publishing option enabled */ it('Should add IDs when automatic idempotent rest publishing option enabled', async function () { /* easiest way to get the host we're using for tests */ - var dummyRest = helper.AblyRestPromise(), + var dummyRest = helper.AblyRest(), host = dummyRest.options.restHost, /* Add the same host as a bunch of fallback hosts, so after the first * request 'fails' we retry on the same host using the fallback mechanism */ - rest = helper.AblyRestPromise({ + rest = helper.AblyRest({ idempotentRestPublishing: true, useBinaryProtocol: false, fallbackHosts: [host, host, host], @@ -180,7 +180,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); it('Rest publish params', async function () { - var rest = helper.AblyRestPromise(), + var rest = helper.AblyRest(), channel = rest.channels.get('publish_params'); var originalPublish = channel._publish; diff --git a/test/rest/presence.test.js b/test/rest/presence.test.js index 7e7f519084..1c9640631f 100644 --- a/test/rest/presence.test.js +++ b/test/rest/presence.test.js @@ -25,7 +25,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async before(function (done) { helper.setupApp(function () { - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); cipherConfig = helper.getTestApp().cipherConfig; done(); }); diff --git a/test/rest/push.test.js b/test/rest/push.test.js index 5bfe1eb4e0..9d251ffe68 100644 --- a/test/rest/push.test.js +++ b/test/rest/push.test.js @@ -51,13 +51,13 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async } subsByChannel[sub.channel].push(sub); - var rest = helper.AblyRestPromise({ clientId: sub.clientId }); + var rest = helper.AblyRest({ clientId: sub.clientId }); subscribes.push(() => rest.push.admin.channelSubscriptions.save(sub)); deletes.push(() => rest.push.admin.channelSubscriptions.remove(sub)); })(i); } - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); await Promise.all(subscribes.map((sub) => sub())); @@ -72,7 +72,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async it('Publish', async function () { try { - var realtime = helper.AblyRealtimePromise(); + var realtime = helper.AblyRealtime(); var channel = realtime.channels.get('pushenabled:foo'); await channel.attach(); @@ -108,7 +108,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); it('deviceRegistrations save', async function () { - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); var saved = await rest.push.admin.deviceRegistrations.save(testDevice); var got = await rest.push.admin.deviceRegistrations.get(testDevice.id); @@ -162,7 +162,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async devices.push(device); devices_withoutSecret.push(device_withoutSecret); - var rest = helper.AblyRestPromise({ clientId: device.clientId }); + var rest = helper.AblyRest({ clientId: device.clientId }); registrations.push(function () { return rest.push.admin.deviceRegistrations.save(device); }); @@ -172,7 +172,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async })(i); } - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); var res0 = await Promise.all(registrations.map((x) => x())); var res1 = await rest.push.admin.deviceRegistrations.list(null); @@ -195,7 +195,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); it('deviceRegistrations remove removeWhere', async function () { - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); await rest.push.admin.deviceRegistrations.save(testDevice); await rest.push.admin.deviceRegistrations.remove(testDevice.id); @@ -219,7 +219,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); it('channelSubscriptions save', async function () { - var rest = helper.AblyRestPromise({ clientId: 'testClient' }); + var rest = helper.AblyRest({ clientId: 'testClient' }); var subscription = { clientId: 'testClient', channel: 'pushenabled:foo' }; var saved = await rest.push.admin.channelSubscriptions.save(subscription); @@ -245,7 +245,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async } subsByChannel[sub.channel].push(sub); - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); subscribes.push(function () { return rest.push.admin.channelSubscriptions.save(sub); }); @@ -255,7 +255,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async })(i); } - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); await Promise.all(subscribes.map((x) => x())); @@ -269,7 +269,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async }); it('push_channelSubscriptions_remove', async function () { - var rest = helper.AblyRestPromise({ clientId: 'testClient' }); + var rest = helper.AblyRest({ clientId: 'testClient' }); var subscription = { clientId: 'testClient', channel: 'pushenabled:foo' }; await rest.push.admin.channelSubscriptions.save(subscription); @@ -282,7 +282,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async for (var i = 0; i < 5; i++) { (function (i) { var sub = { channel: 'pushenabled:listChannels' + ((i % 2) + 1), clientId: 'testClient' + ((i % 3) + 1) }; - var rest = helper.AblyRestPromise({ clientId: sub.clientId }); + var rest = helper.AblyRest({ clientId: sub.clientId }); subscribes.push(function (callback) { return rest.push.admin.channelSubscriptions.save(sub); }); @@ -292,7 +292,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async })(i); } - var rest = helper.AblyRestPromise(); + var rest = helper.AblyRest(); await Promise.all(subscribes.map((x) => x())); diff --git a/test/rest/request.test.js b/test/rest/request.test.js index 844d7f75cd..7055f46191 100644 --- a/test/rest/request.test.js +++ b/test/rest/request.test.js @@ -17,7 +17,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async done(err); return; } - rest = helper.AblyRestPromise({ useBinaryProtocol: false }); + rest = helper.AblyRest({ useBinaryProtocol: false }); done(); }); }); @@ -68,7 +68,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async /* With a network issue, should get an actual err, not an HttpPaginatedResponse with error members */ it('request_network_error', async function () { - rest = helper.AblyRestPromise({ restHost: helper.unroutableAddress }); + rest = helper.AblyRest({ restHost: helper.unroutableAddress }); try { var res = await rest.request('get', '/time', Defaults.protocolVersion, null, null, null); } catch (err) { @@ -168,7 +168,7 @@ define(['ably', 'shared_helper', 'async', 'chai'], function (Ably, helper, async utils.arrForEach(['put', 'patch', 'delete'], function (method) { it('check' + method, async function () { - var restEcho = helper.AblyRestPromise({ useBinaryProtocol: false, restHost: echoServerHost, tls: true }); + var restEcho = helper.AblyRest({ useBinaryProtocol: false, restHost: echoServerHost, tls: true }); var res = await restEcho.request(method, '/methods', Defaults.protocolVersion, {}, {}, {}); expect(res.items[0] && res.items[0].method).to.equal(method); }); diff --git a/test/rest/stats.test.js b/test/rest/stats.test.js index b733be0c45..bda82edfb5 100644 --- a/test/rest/stats.test.js +++ b/test/rest/stats.test.js @@ -64,7 +64,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { before(function (done) { // force a new app to be created with first argument true so that stats are not effected by other tests helper.setupApp(true, function () { - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); helper.createStats(helper.getTestApp(), statsFixtures, function (err) { if (err) { done(err); diff --git a/test/rest/status.test.js b/test/rest/status.test.js index 91063551e0..45e4ee144f 100644 --- a/test/rest/status.test.js +++ b/test/rest/status.test.js @@ -15,7 +15,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { done(err); return; } - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); done(); }); }); diff --git a/test/rest/time.test.js b/test/rest/time.test.js index 62fba2c66b..71d0ee28ab 100644 --- a/test/rest/time.test.js +++ b/test/rest/time.test.js @@ -12,7 +12,7 @@ define(['shared_helper', 'chai'], function (helper, chai) { done(err); return; } - rest = helper.AblyRestPromise(); + rest = helper.AblyRest(); done(); }); });