Update tests for requestFor (AuthRequestBuilderProtocol) changes

Author: hamchapman

Tests/AuthenticationTests.swift

@@ -108,12 +108,51 @@ class AuthenticationTests: XCTestCase {
         waitForExpectations(timeout: 0.5)
     }
 
-    func testAuthorizationUsingSomethingConformingToTheAuthRequestBuilderProtocol() {
+    func testAuthorizationUsingSomethingConformingToTheDeprecatedAuthRequestBuilderProtocol() {
 
         class AuthRequestBuilder: AuthRequestBuilderProtocol {
-            func requestFor(socketID: String, channel: PusherChannel) -> URLRequest? {
+            func requestFor(socketID: String, channelName: String) -> URLRequest? {
                 var request = URLRequest(url: URL(string: "http://localhost:9292/builder")!)
                 request.httpMethod = "POST"
+                request.httpBody = "socket_id=\(socketID)&channel_name=\(channelName)".data(using: String.Encoding.utf8)
+                request.addValue("myToken", forHTTPHeaderField: "Authorization")
+                return request
+            }
+        }
+
+        let ex = expectation(description: "the channel should be subscribed to successfully")
+        let channelName = "private-test-channel"
+
+        let dummyDelegate = DummyDelegate()
+        dummyDelegate.ex = ex
+        dummyDelegate.testingChannelName = channelName
+
+        let options = PusherClientOptions(
+            authMethod: AuthMethod.authRequestBuilder(authRequestBuilder: AuthRequestBuilder())
+        )
+        pusher = Pusher(key: "testKey123", options: options)
+        pusher.delegate = dummyDelegate
+        socket.delegate = pusher.connection
+        pusher.connection.socket = socket
+
+        let jsonData = "{\"auth\":\"testKey123:12345678gfder78ikjbg\"}".data(using: String.Encoding.utf8, allowLossyConversion: false)!
+        let urlResponse = HTTPURLResponse(url: URL(string: "http://localhost:9292/builder?channel_name=private-test-channel&socket_id=45481.3166671")!, statusCode: 200, httpVersion: nil, headerFields: nil)
+        MockSession.mockResponse = (jsonData, urlResponse: urlResponse, error: nil)
+        pusher.connection.URLSession = MockSession.shared
+
+        let chan = pusher.subscribe("private-test-channel")
+        XCTAssertFalse(chan.subscribed, "the channel should not be subscribed")
+        pusher.connect()
+
+        waitForExpectations(timeout: 0.5)
+    }
+
+    func testAuthorizationUsingSomethingConformingToTheAuthRequestBuilderProtocol() {
+
+        class AuthRequestBuilder: AuthRequestBuilderProtocol {
+            func requestFor(socketID: String, channel: PusherChannel) -> NSMutableURLRequest? {
+                let request = NSMutableURLRequest(url: URL(string: "http://localhost:9292/builder")!)
+                request.httpMethod = "POST"
                 request.httpBody = "socket_id=\(socketID)&channel_name=\(channel.name)".data(using: String.Encoding.utf8)
                 request.addValue("myToken", forHTTPHeaderField: "Authorization")
                 return request