Update protocol version to 1.1

Source/ARTDefault.m

@@ -12,7 +12,7 @@ @implementation ARTDefault
 
 NSString *const ARTDefault_restHost = @"rest.ably.io";
 NSString *const ARTDefault_realtimeHost = @"realtime.ably.io";
-NSString *const ARTDefault_version = @"1.0";
+NSString *const ARTDefault_version = @"1.1";
 NSString *const ARTDefault_libraryVersion = @"1.0.14";
 NSString *const ARTDefault_ablyBundleId = @"io.ably.Ably";
 NSString *const ARTDefault_bundleVersionKey = @"CFBundleShortVersionString";

Spec/PushAdmin.swift

@@ -229,9 +229,14 @@ class PushAdmin : QuickSpec {
                 }
             }
 
-            pending("should work as expected") {
-                let realtime = ARTRealtime(options: AblyTests.commonAppSetup())
+            it("should publish successfully") {
+                let options = AblyTests.commonAppSetup()
+                let realtime = ARTRealtime(options: options)
                 let channel = realtime.channels.get("pushenabled:push_admin_publish-ok")
+                let publishObject = ["transportType": "ablyChannel",
+                                     "channel": channel.name,
+                                     "ablyKey": options.key!,
+                                     "ablyUrl": "https://\(options.restHost)"]
 
                 waitUntil(timeout: testTimeout) { done in
                     channel.attach() { error in
@@ -242,16 +247,14 @@ class PushAdmin : QuickSpec {
 
                 waitUntil(timeout: testTimeout) { done in
                     let partialDone = AblyTests.splitDone(2, done: done)
-                    // FIXME: waiting a response
-                    // https://github.com/ably/ably-ios/issues/669
                     channel.subscribe("__ably_push__") { message in
-                        guard let data = message.data as? NSDictionary else {
-                            fail("Data is not a JSON Object"); partialDone(); return
+                        guard let data = message.data as? String else {
+                            fail("Failure in reading returned data"); partialDone(); return
                         }
-                        expect(data).to(equal(["data": ["foo": "bar"]] as NSDictionary))
+                        expect(data).to(contain("foo"))
                         partialDone()
                     }
-                    realtime.push.admin.publish(["ablyChannel": channel.name], data: ["data": ["foo": "bar"]]) { error in
+                    realtime.push.admin.publish(publishObject, data: ["data": ["foo": "bar"]]) { error in
                         expect(error).to(beNil())
                         partialDone()
                     }

Spec/RealtimeClient.swift

@@ -36,7 +36,7 @@ class RealtimeClient: QuickSpec {
                     channel.publish(nil, data: "message") { error in
                         expect(error).to(beNil())
                         let transport = client.transport as! TestProxyTransport
-                        expect(transport.lastUrl!.query).to(haveParam("v", withValue: "1.0"))
+                        expect(transport.lastUrl!.query).to(haveParam("v", withValue: ARTDefault.version()))
                         done()
                     }
                 }

Spec/RestClient.swift

@@ -27,7 +27,7 @@ class RestClient: QuickSpec {
                     channel.publish(nil, data: "message") { error in
                         expect(error).to(beNil())
                         let version = testHTTPExecutor.requests.first!.allHTTPHeaderFields?["X-Ably-Version"]
-                        expect(version).to(equal("1.0"))
+                        expect(version).to(equal(ARTDefault.version()))
                         done()
                     }
                 }

Spec/RestClientChannel.swift

@@ -327,15 +327,17 @@ class RestClientChannel: QuickSpec {
             }
 
             // RSL1h, RSL6a2
-            pending("should provide an optional argument that allows the extras value to be specified") {
-                // TODO: pushenabled doesn't appear to be working.
+            it("should provide an optional argument that allows the extras value to be specified") {
                 let client = ARTRest(options: AblyTests.commonAppSetup())
+                let originalARTChannels_getChannelNamePrefix = ARTChannels_getChannelNamePrefix
+                defer { ARTChannels_getChannelNamePrefix = originalARTChannels_getChannelNamePrefix }
+                ARTChannels_getChannelNamePrefix = nil // Force that channel name is not changed.
                 let channel = client.channels.get("pushenabled:test")
-                let extras = ["push": ["key": "value"]] as ARTJsonCompatible
+                let extras = ["notification": ["title": "Hello from Ably!"]] as ARTJsonCompatible
 
                 expect((client.encoders["application/json"] as! ARTJsonLikeEncoder).message(from: [
                     "data": "foo",
-                    "extras": ["push": ["key": "value"]]
+                    "extras": ["notification": ["title": "Hello from Ably!"]]
                 ]).extras == extras).to(beTrue())
 
                 waitUntil(timeout: testTimeout) { done in