Merge pull request #372 from ably/fix-rtp8a

RTP8a, RTL7f: attach first to avoid race condition.
ably · Apr 5, 2016 · accf1f4 · accf1f4
2 parents c543e39 + cbf948d
commit accf1f4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/Spec/RealtimeClientChannel.swift b/Spec/RealtimeClientChannel.swift
@@ -1325,16 +1325,19 @@ class RealtimeClientChannel: QuickSpec {
                     let channel2 = client2.channels.get("test")
 
                     waitUntil(timeout: testTimeout) { done in
-                        channel1.subscribe { message in
-                            expect(message.data as? String).to(equal("message"))
-                            delay(1.0) { done() }
-                        }
+                        channel1.attach { err in
+                            expect(err).to(beNil())
+                            channel1.subscribe { message in
+                                expect(message.data as? String).to(equal("message"))
+                                delay(1.0) { done() }
+                            }
 
-                        channel2.subscribe { message in
-                            fail("Shouldn't receive the message")
-                        }
+                            channel2.subscribe { message in
+                                fail("Shouldn't receive the message")
+                            }
 
-                        channel2.publish(nil, data: "message")
+                            channel2.publish(nil, data: "message")
+                        }
                     }
                 }
 

diff --git a/Spec/RealtimeClientPresence.swift b/Spec/RealtimeClientPresence.swift
@@ -287,12 +287,15 @@ class RealtimeClientPresence: QuickSpec {
                     let channel2 = client2.channels.get("test")
 
                     waitUntil(timeout: testTimeout) { done in
-                        channel1.presence.subscribe(.Enter) { member in
-                            expect(member.clientId).to(equal(options.clientId))
-                            expect(member.data as? NSObject).to(equal("online"))
-                            done()
+                        channel1.attach { err in 
+                            expect(err).to(beNil())
+                            channel1.presence.subscribe(.Enter) { member in
+                                expect(member.clientId).to(equal(options.clientId))
+                                expect(member.data as? NSObject).to(equal("online"))
+                                done()
+                            }
+                            channel2.presence.enter("online")
                         }
-                        channel2.presence.enter("online")
                     }
                 }