A few changes that got lost in a rebase with conflicts.

ably · Jan 4, 2016 · 1df3e28 · 1df3e28
1 parent 3529066
commit 1df3e28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ably-ios/ARTWebSocketTransport.m b/ably-ios/ARTWebSocketTransport.m
@@ -109,7 +109,7 @@ - (void)connect {
                 return;
             }
 
-            NSURLQueryItem *accessTokenParam = [NSURLQueryItem queryItemWithName:@"access_token" value:(tokenDetails.token)];
+            NSURLQueryItem *accessTokenParam = [NSURLQueryItem queryItemWithName:@"accessToken" value:(tokenDetails.token)];
             [selfStrong setupWebSocket:@[accessTokenParam] withOptions:selfStrong.options];
             // Connect
             [selfStrong.websocket open];
@@ -208,7 +208,7 @@ - (void)abort:(ARTStatus *)reason {
 
 - (void)webSocketOpen {
     ARTWebSocketTransport * __weak weakSelf = self;
-    [self.logger debug:__FILE__ line:__LINE__ message:@"%p websocket did open", self]; 
+    [self.logger debug:__FILE__ line:__LINE__ message:@"%p websocket did open", self];
 
     CFRunLoopPerformBlock(self.rl, kCFRunLoopDefaultMode, ^{
         ARTWebSocketTransport *s = weakSelf;
@@ -292,7 +292,7 @@ - (void)webSocketMessageText:(NSString *)text {
         ARTWebSocketTransport *s = weakSelf;
         if (s) {
             ARTProtocolMessage *pm = [s.encoder decodeProtocolMessage:data];
-            [s.delegate realtimeTransport:s didReceiveMessage:pm];
+            [s receive:pm];
         }
     });
     CFRunLoopWakeUp(self.rl);
@@ -306,7 +306,7 @@ - (void)webSocketMessageData:(NSData *)data {
         ARTWebSocketTransport *s = weakSelf;
         if (s) {
             ARTProtocolMessage *pm = [s.encoder decodeProtocolMessage:data];
-            [s.delegate realtimeTransport:s didReceiveMessage:pm];
+            [s receive:pm];
         }
     });
     CFRunLoopWakeUp(self.rl);

diff --git a/ablySpec/Auth.swift b/ablySpec/Auth.swift
@@ -147,7 +147,7 @@ class Auth : QuickSpec {
                     client.connect()
 
                     if let transport = client.transport as? MockTransport, let query = transport.lastUrl?.query {
-                        expect(query).to(haveParam("access_token", withValue: client.auth().tokenDetails?.token ?? ""))
+                        expect(query).to(haveParam("accessToken", withValue: client.auth().tokenDetails?.token ?? ""))
                     }
                     else {
                         XCTFail("MockTransport is not working")