@@ -30,7 +30,7 @@ describe('#listeners', () => {
30
30
pubnub . stop ( ) ;
31
31
} ) ;
32
32
33
- it ( 'should pass messages of subscribed channel to its listener' , async ( ) => {
33
+ it ( 'should pass messages of subscribed channel to its listener' , ( done ) => {
34
34
utils
35
35
. createNock ( )
36
36
. get ( '/v2/subscribe/mySubKey/ch1/0' )
@@ -58,16 +58,15 @@ describe('#listeners', () => {
58
58
) ;
59
59
var channel = pubnub . channel ( 'ch1' ) ;
60
60
var subscription = channel . subscription ( ) ;
61
- var messagePromise = new Promise ( ( resolveMessage ) =>
62
- subscription . addListener ( {
63
- message : ( m ) => resolveMessage ( m ) ,
64
- } ) ,
65
- ) ;
66
- subscription . subscribe ( ) ;
67
- const actual = await messagePromise ;
68
- expect ( JSON . stringify ( actual . message ) ) . to . equal ( '{"message":"My message!"}' ) ;
61
+ subscription . addListener ( {
62
+ message : ( m ) => {
63
+ expect ( JSON . stringify ( m . message ) ) . to . equal ( '{"message":"My message!"}' ) ;
64
+ done ( ) ;
65
+ } ,
66
+ } ) ,
67
+ subscription . subscribe ( ) ;
69
68
} ) ;
70
- it ( 'should subscribed to channel and presence channels' , async ( ) => {
69
+ it ( 'should subscribed to channel and presence channels' , ( done ) => {
71
70
utils
72
71
. createNock ( )
73
72
. get ( '/v2/subscribe/mySubKey/ch1%2Cch1-pnpres/0' )
@@ -96,17 +95,17 @@ describe('#listeners', () => {
96
95
97
96
const channel = pubnub . channel ( 'ch1' ) ;
98
97
const subscription = channel . subscription ( { receivePresenceEvents : true } ) ;
99
- const messagePromise = new Promise ( ( resolveMessage ) =>
100
- subscription . addListener ( {
101
- message : ( m ) => resolveMessage ( m ) ,
102
- } ) ,
103
- ) ;
104
- subscription . subscribe ( ) ;
105
- const actual = await messagePromise ;
106
- expect ( JSON . stringify ( actual . message ) ) . to . equal ( '{"message":"My message!"}' ) ;
98
+
99
+ subscription . addListener ( {
100
+ message : ( m ) => {
101
+ expect ( JSON . stringify ( m . message ) ) . to . equal ( '{"message":"My message!"}' ) ;
102
+ done ( ) ;
103
+ } ,
104
+ } ) ,
105
+ subscription . subscribe ( ) ;
107
106
} ) ;
108
107
109
- it ( 'should work with subscriptionSet' , async ( ) => {
108
+ it ( 'should work with subscriptionSet' , ( done ) => {
110
109
utils
111
110
. createNock ( )
112
111
. get ( '/v2/subscribe/mySubKey/ch1%2Cch2/0' )
@@ -136,17 +135,16 @@ describe('#listeners', () => {
136
135
const channel = pubnub . channel ( 'ch1' ) ;
137
136
const subscription = channel . subscription ( ) ;
138
137
const subscriptionSet = subscription . addSubscription ( pubnub . channel ( 'ch2' ) . subscription ( ) ) ;
139
- const messagePromise = new Promise ( ( resolveMessage ) =>
140
- subscriptionSet . addListener ( {
141
- message : ( m ) => resolveMessage ( m ) ,
142
- } ) ,
143
- ) ;
144
- subscriptionSet . subscribe ( ) ;
145
- const actual = await messagePromise ;
146
- expect ( JSON . stringify ( actual . message ) ) . to . equal ( '{"message":"My message!"}' ) ;
138
+ subscriptionSet . addListener ( {
139
+ message : ( m ) => {
140
+ expect ( JSON . stringify ( m . message ) ) . to . equal ( '{"message":"My message!"}' ) ;
141
+ done ( ) ;
142
+ } ,
143
+ } ) ,
144
+ subscriptionSet . subscribe ( ) ;
147
145
} ) ;
148
146
149
- it ( 'listener should route presence event to registered handler' , async ( ) => {
147
+ it ( 'listener should route presence event to registered handler' , ( done ) => {
150
148
utils
151
149
. createNock ( )
152
150
. get ( '/v2/subscribe/mySubKey/ch1%2Cch1-pnpres/0' )
@@ -175,18 +173,18 @@ describe('#listeners', () => {
175
173
176
174
const channel = pubnub . channel ( 'ch1' ) ;
177
175
const subscription = channel . subscription ( { receivePresenceEvents : true } ) ;
178
- const presencePromise = new Promise ( ( resolvePresence ) =>
179
- subscription . addListener ( {
180
- presence : ( p ) => resolvePresence ( p ) ,
181
- } ) ,
182
- ) ;
183
- subscription . subscribe ( ) ;
184
- const actual = await presencePromise ;
185
- expect ( actual . action ) . to . equal ( 'join' ) ;
186
- expect ( actual . occupancy ) . to . equal ( 2 ) ;
176
+
177
+ subscription . addListener ( {
178
+ presence : ( p ) => {
179
+ expect ( p . action ) . to . equal ( 'join' ) ;
180
+ expect ( p . occupancy ) . to . equal ( 2 ) ;
181
+ done ( ) ;
182
+ } ,
183
+ } ) ,
184
+ subscription . subscribe ( ) ;
187
185
} ) ;
188
186
189
- it ( 'add/remove listener should work on subscription' , async ( ) => {
187
+ it ( 'add/remove listener should work on subscription' , ( done ) => {
190
188
utils
191
189
. createNock ( )
192
190
. get ( '/v2/subscribe/mySubKey/ch1/0' )
@@ -217,19 +215,19 @@ describe('#listeners', () => {
217
215
const subscription = channel . subscription ( ) ;
218
216
const listener = { message : ( m ) => messages . push ( m ) } ;
219
217
subscription . addListener ( listener ) ;
220
- const messagePromise = new Promise ( ( resolveMessage ) =>
221
- subscription . addListener ( {
222
- message : ( m ) => resolveMessage ( m ) ,
223
- } ) ,
224
- ) ;
225
- subscription . removeListener ( listener ) ;
218
+
219
+ subscription . addListener ( {
220
+ message : ( m ) => {
221
+ expect ( JSON . stringify ( m . message ) ) . to . equal ( '{"message":"My message!"}' ) ;
222
+ expect ( messages . length ) . to . equal ( 0 ) ;
223
+ done ( ) ;
224
+ } ,
225
+ } ) ,
226
+ subscription . removeListener ( listener ) ;
226
227
subscription . subscribe ( ) ;
227
- const actual = await messagePromise ;
228
- expect ( JSON . stringify ( actual . message ) ) . to . equal ( '{"message":"My message!"}' ) ;
229
- expect ( messages . length ) . to . equal ( 0 ) ;
230
228
} ) ;
231
229
232
- it ( 'should work with channel groups and their presence' , async ( ) => {
230
+ it ( 'should work with channel groups and their presence' , ( done ) => {
233
231
utils
234
232
. createNock ( )
235
233
. get ( '/v2/subscribe/mySubKey/%2C/0' )
@@ -261,11 +259,12 @@ describe('#listeners', () => {
261
259
var subscription = channelGroup . subscription ( { receivePresenceEvents : true } ) ;
262
260
var messagePromise = new Promise ( ( resolveMessage ) =>
263
261
subscription . addListener ( {
264
- message : ( m ) => resolveMessage ( m ) ,
262
+ message : ( m ) => {
263
+ expect ( JSON . stringify ( m . message ) ) . to . equal ( '{"message":"My message!"}' ) ;
264
+ done ( ) ;
265
+ } ,
265
266
} ) ,
266
267
) ;
267
268
subscription . subscribe ( ) ;
268
- const actual = await messagePromise ;
269
- expect ( JSON . stringify ( actual . message ) ) . to . equal ( '{"message":"My message!"}' ) ;
270
269
} ) ;
271
270
} ) ;
0 commit comments