瀏覽代碼

Removed OSX cookie check since the underlying issue has been resolved.

Christian Noon 10 年之前
父節點
當前提交
601a40a46e
共有 2 個文件被更改,包括 8 次插入15 次删除
  1. 8 12
      Source/Request.swift
  2. 0 3
      Tests/RequestTests.swift

+ 8 - 12
Source/Request.swift

@@ -436,19 +436,15 @@ extension Request: CustomDebugStringConvertible {
             }
         }
 
-        // Temporarily disabled on OS X due to build failure for CocoaPods
-        // See https://github.com/CocoaPods/swift/issues/24
-        #if !os(OSX)
-            if session.configuration.HTTPShouldSetCookies {
-                if let
-                    cookieStorage = session.configuration.HTTPCookieStorage,
-                    cookies = cookieStorage.cookiesForURL(URL!) where !cookies.isEmpty
-                {
-                    let string = cookies.reduce(""){ $0 + "\($1.name)=\($1.value ?? String());" }
-                    components.append("-b \"\(string.substringToIndex(string.endIndex.predecessor()))\"")
-                }
+        if session.configuration.HTTPShouldSetCookies {
+            if let
+                cookieStorage = session.configuration.HTTPCookieStorage,
+                cookies = cookieStorage.cookiesForURL(URL!) where !cookies.isEmpty
+            {
+                let string = cookies.reduce("") { $0 + "\($1.name)=\($1.value ?? String());" }
+                components.append("-b \"\(string.substringToIndex(string.endIndex.predecessor()))\"")
             }
-        #endif
+        }
 
         if let headerFields = request.allHTTPHeaderFields {
             for (field, value) in headerFields {

+ 0 - 3
Tests/RequestTests.swift

@@ -425,10 +425,7 @@ class RequestDebugDescriptionTestCase: BaseTestCase {
         XCTAssertEqual(components[0..<3], ["$", "curl", "-i"], "components should be equal")
         XCTAssertEqual(components[3..<5], ["-X", "POST"], "command should contain explicit -X flag")
         XCTAssertEqual(components.last ?? "", "\"\(URLString)\"", "URL component should be equal")
-
-        #if !os(OSX)
         XCTAssertEqual(components[5..<6], ["-b"], "command should contain -b flag")
-        #endif
     }
 
     func testPOSTRequestWithCookiesDisabledDebugDescription() {