Support empty response bodies

uphold · Feb 22, 2016 · 916f8d9 · 916f8d9
1 parent 10d0f98
commit 916f8d9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/Source/Client/UpholdRestAdapter.swift b/Source/Client/UpholdRestAdapter.swift
@@ -45,13 +45,12 @@ public class UpholdRestAdapter {
                     return
                 }
 
-                guard let _ = response.text else {
+                if let body = response.text where !body.isEmpty {
+                    reject(LogicError(code: nil, message: "Response body should be empty."))
+                } else {
                     fulfill(response)
-
-                    return
                 }
 
-                reject(LogicError(code: nil, message: "Response body should be empty."))
                 }, onError: { (error: NSError) -> Void in
                     reject(error)
             })

diff --git a/Tests/Integration/Client/UpholdRestAdapterTest.swift b/Tests/Integration/Client/UpholdRestAdapterTest.swift
@@ -56,6 +56,22 @@ class UpholdRestAdapterTest: UpholdTestCase {
         wait()
     }
 
+    func testBuildEmptyResponseWithBodyShouldReturnFulfilledPromise() {
+        let expectation = expectationWithDescription("Uphold REST adapter response test.")
+        let mockRequest = MockRequest(body: "", code: 200, errorHandler: {(error: NSError) -> Void in}, headers: nil, method: "foo")
+        let request = UpholdRestAdapter().buildRequest(mockRequest)
+        let promise: Promise<Response> = UpholdRestAdapter().buildEmptyResponse(request)
+
+        promise.then { (response: Response) -> () in
+            XCTAssertEqual(response.basicStatus, Response.BasicResponseType.OK, "Failed: Wrong response basic status code.")
+            XCTAssertEqual(response.text, "", "Failed: Wrong response body.")
+
+            expectation.fulfill()
+        }
+
+        wait()
+    }
+
     func testBuildEmptyResponseShouldReturnLogicError() {
         let expectation = expectationWithDescription("Uphold REST adapter response test.")
         let mockRequest = MockRequest(body: "foobar", code: 200, errorHandler: {(error: NSError) -> Void in}, headers: nil, method: "foo")