Merge pull request #146 from ably/fix-rsl1c

RSL1c: check that it happens in a single request.
ably · Jan 26, 2016 · c678de0 · c678de0
2 parents 909cce3 + 2dd6635
commit c678de0
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/ablySpec/RestChannel.swift b/ablySpec/RestChannel.swift
@@ -170,7 +170,11 @@ class RestChannel: QuickSpec {
 
             // RSL1c
             context("with an array of Message objects") {
-                it("publishes the messages and invokes callback with success") {
+                it("publishes the messages in a single request and invokes callback with success") {
+                    let oldExecutor = client.httpExecutor
+                    defer { client.httpExecutor = oldExecutor}
+                    client.httpExecutor = mockExecutor
+
                     var publishError: NSError? = NSError(domain: "", code: -1, userInfo: nil)
                     var publishedMessages: [ARTMessage] = []
 
@@ -180,6 +184,7 @@ class RestChannel: QuickSpec {
                     ]
                     channel.publishMessages(messages) { error in
                         publishError = error
+                        client.httpExecutor = oldExecutor
                         try! channel.history(nil) { result, _ in
                             if let items = result?.items as? [ARTMessage] {
                                 publishedMessages.appendContentsOf(items)
@@ -191,6 +196,8 @@ class RestChannel: QuickSpec {
                     expect(publishedMessages.count).toEventually(equal(messages.count), timeout: testTimeout)
                     expect(publishedMessages).toEventually(contain(messages.first), timeout: testTimeout)
                     expect(publishedMessages).toEventually(contain(messages.last), timeout: testTimeout)
+
+                    expect(mockExecutor.requests.count).to(equal(1))
                 }
             }
         }