From fff273298b76e96cf9eca3775bd0a218f89c1168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toni=20C=C3=A1rdenas?= <toni@tcardenas.me>
Date: Mon, 8 Aug 2016 15:19:05 +0200
Subject: [PATCH] Add messages fixtures test.

/~https://github.com/ably/wiki/issues/22
---
 Spec/RealtimeClientConnection.swift | 84 +++++++++++++++++++++++++++++
 ably-common                         |  2 +-
 2 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/Spec/RealtimeClientConnection.swift b/Spec/RealtimeClientConnection.swift
index 179a0e6ec..23e600ac9 100644
--- a/Spec/RealtimeClientConnection.swift
+++ b/Spec/RealtimeClientConnection.swift
@@ -8,6 +8,7 @@
 
 import Quick
 import Nimble
+import SwiftyJSON
 
 func countChannels(channels: ARTRealtimeChannels) -> Int {
     var i = 0
@@ -2963,6 +2964,89 @@ class RealtimeClientConnection: QuickSpec {
                 expect(client.connection.state).to(equal(ARTRealtimeConnectionState.Disconnected))
                 expect(client.connection.errorReason).to(equal(protoMsg.error))
             }
+
+            // /~https://github.com/ably/wiki/issues/22
+            it("should encode and decode fixture messages as expected") {
+                let fixtures = JSON(data: NSData(contentsOfFile: pathForTestResource(testResourcesPath + "messages-encoding.json"))!, options: .MutableContainers)
+
+                let options = AblyTests.commonAppSetup()
+                let client = AblyTests.newRealtime(options)
+                defer { client.close() }
+                let channel = client.channels.get("test")
+                channel.attach()
+
+                expect(channel.state).toEventually(equal(ARTRealtimeChannelState.Attached), timeout: testTimeout)
+                if channel.state != .Attached {
+                    return
+                }
+
+                for (_, fixtureMessage) in fixtures["messages"] {
+                    var receivedMessage: ARTMessage?
+
+                    waitUntil(timeout: testTimeout) { done in
+                        channel.subscribe { message in
+                            channel.unsubscribe()
+                            receivedMessage = message
+                            done()
+                        }
+
+                        let request = NSMutableURLRequest(URL: NSURL(string: "/channels/\(channel.name)/messages")!)
+                        request.HTTPMethod = "POST"
+                        request.HTTPBody = try! fixtureMessage.rawData()
+                        request.allHTTPHeaderFields = [
+                            "Accept" : "application/json",
+                            "Content-Type" : "application/json"
+                        ]
+                        client.rest.executeRequest(request, withAuthOption: .On, completion: { _, _, err in
+                            if let err = err {
+                                fail("\(err)")
+                            }
+                        })
+                    }
+
+                    guard let message = receivedMessage else {
+                        continue
+                    }
+
+                    switch fixtureMessage["expectedType"].string! {
+                    case "string":
+                        expect(message.data as? NSString).toNot(beNil())
+                    case "map":
+                        expect(message.data as? NSDictionary).toNot(beNil())
+                    case "array":
+                        expect(message.data as? NSArray).toNot(beNil())
+                    case "binary":
+                        expect(message.data as? NSData).toNot(beNil())
+                    default:
+                        fail("unhandled: \(fixtureMessage["expectedType"].string!)")
+                    }
+
+                    waitUntil(timeout: testTimeout) { done in
+                        channel.publish([message]) { err in
+                            if let err = err {
+                                fail("\(err)")
+                                done()
+                                return
+                            }
+
+                            let request = NSMutableURLRequest(URL: NSURL(string: "/channels/\(channel.name)/messages")!)
+                            request.HTTPMethod = "GET"
+                            request.allHTTPHeaderFields = ["Accept" : "application/json"]
+                            client.rest.executeRequest(request, withAuthOption: .On, completion: { _, data, err in
+                                if let err = err {
+                                    fail("\(err)")
+                                    done()
+                                    return
+                                }
+                                let persistedMessage = JSON(data: data!).array!.first!
+                                expect(persistedMessage["data"]).to(equal(fixtureMessage["data"]))
+                                expect(persistedMessage["encoding"]).to(equal(fixtureMessage["encoding"]))
+                                done()
+                            })
+                        }
+                    }
+                }
+            }
         }
     }
 }
diff --git a/ably-common b/ably-common
index 34b393747..c1e62d7a1 160000
--- a/ably-common
+++ b/ably-common
@@ -1 +1 @@
-Subproject commit 34b3937475b037e5827cafd1b6b1f3a57b7f06b2
+Subproject commit c1e62d7a1bda09fda41d7ddd8a48e172b4eae78e