Merge pull request #295 from ably/fix-rtl5b

Fix RTL5b
ably · Mar 16, 2016 · 7e33512 · 7e33512
2 parents 3d7f9bc + 2adee49
commit 7e33512
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 28 deletions.
diff --git a/Spec/RealtimeClientChannel.swift b/Spec/RealtimeClientChannel.swift
@@ -573,7 +573,13 @@ class RealtimeClientChannel: QuickSpec {
                     let channel = client.channels.get("test")
                     client.onError(AblyTests.newErrorProtocolMessage())
                     expect(client.connection.state).to(equal(ARTRealtimeConnectionState.Failed))
-                    expect(channel.detach()).toNot(beNil())
+
+                    waitUntil(timeout: testTimeout) { done in
+                        channel.detach() { errorInfo in
+                            expect(errorInfo!.code).to(equal(90000))
+                            done()
+                        }
+                    }
                 }
 
                 // RTL5d

diff --git a/Tests/ARTRealtimeChannelTest.m b/Tests/ARTRealtimeChannelTest.m
@@ -320,33 +320,6 @@ - (void)testAttachFails {
     [self waitForExpectationsWithTimeout:[ARTTestUtil timeout] handler:nil];
 }
 
-- (void)testDetachFails {
-    XCTestExpectation *exp = [self expectationWithDescription:@"testDetachFails"];
-    [ARTTestUtil testRealtime:^(ARTRealtime *realtime) {
-        _realtime = realtime;
-        ARTRealtimeChannel *channel = [realtime.channels get:@"attach"];
-        [realtime.connection on:^(ARTConnectionStateChange *stateChange) {
-            ARTRealtimeConnectionState state = stateChange.current;
-            if (state == ARTRealtimeConnected) {
-                [channel on:^(ARTErrorInfo *errorInfo) {
-                    if (channel.state == ARTRealtimeChannelAttached) {
-                        [realtime onError:[ARTTestUtil newErrorProtocolMessage]];
-                    }
-                }];
-                [channel attach];
-            }
-            else if(state == ARTRealtimeFailed) {
-                [channel detach:^(ARTErrorInfo *errorInfo) {
-                    XCTAssert(errorInfo);
-                    XCTAssertEqual(errorInfo.code, 90000);
-                    [exp fulfill];
-                }];
-            }
-        }];
-    }];
-    [self waitForExpectationsWithTimeout:[ARTTestUtil timeout] handler:nil];
-}
-
 - (void) testClientIdPreserved {
     NSString *firstClientId = @"firstClientId";
     NSString *channelName = @"channelName";