Merge pull request #1266 from ably/1265-updating-rest-channel-options…

…-should-update-underlying-rest-channel

When setting realtime channel options, pass through to REST channel

Source/ARTRealtimeChannel.m

@@ -1235,6 +1235,7 @@ - (void)setOptions:(ARTRealtimeChannelOptions *_Nullable)options callback:(nulla
 
 - (void)setOptions_nosync:(ARTRealtimeChannelOptions *_Nullable)options callback:(nullable ARTCallback)callback {
     [self setOptions_nosync:options];
+    [self.restChannel setOptions_nosync:options];
 
     if (!options.modes && !options.params) {
         if (callback)

Spec/Test Utilities/NSObject+TestSuite.m

@@ -17,7 +17,7 @@ @implementation NSObject (TestSuite)
     return [self aspect_hookSelector:selector withOptions:AspectPositionAfter usingBlock:^(id<AspectInfo> info) {
         __autoreleasing id arg;
         [[info originalInvocation] getArgument:&arg atIndex:2+index];
-        callback([arg copy]);
+        callback(arg);
     } error:nil];
 }
 

Spec/Tests/RealtimeClientChannelTests.swift

@@ -4188,6 +4188,39 @@ class RealtimeClientChannelTests: XCTestCase {
         expect(lastAttach.flags & subscribeFlag).to(equal(subscribeFlag))
         expect(lastAttach.params).to(equal(channelOptions.params))
     }
+
+    func test__Channel_options__setOptions__shouldUpdateOptionsOfRestChannel() {
+        let client = AblyTests.newRealtime(AblyTests.commonAppSetup())
+        defer { client.dispose(); client.close() }
+        let channel = client.channels.get("foo")
+
+        waitUntil(timeout: testTimeout) { done in
+            client.connection.once(.connected) { _ in
+                done()
+            }
+        }
+
+        var restChannelSetOptions: ARTChannelOptions?
+        let token = channel.internal.restChannel.testSuite_getArgument(from: #selector(ARTRestChannelInternal.setOptions_nosync(_:)), at: 0) { arg in
+            guard let optionsArg = arg as? ARTChannelOptions else {
+                XCTFail("Expected setOptions: to have been called with an ARTChannelOptions instance")
+                return
+            }
+            restChannelSetOptions = optionsArg
+        }
+        defer { token.remove() }
+
+        let channelOptions = ARTRealtimeChannelOptions(cipherKey: ARTCrypto.generateRandomKey() as NSData)
+
+        waitUntil(timeout: testTimeout) { done in
+            channel.setOptions(channelOptions) { error in
+                XCTAssertNil(error)
+                done()
+            }
+        }
+
+        expect(restChannelSetOptions).to(beIdenticalTo(channelOptions))
+    }
 
     // RTL17
     func test__122__Channel__history__should_not_emit_messages_to_subscribers_if_the_channel_is_in_any_state_other_than_ATTACHED() {