瀏覽代碼

Merge branch 'master' into project/multiple_swift_files

# Conflicts:
#	Source/Alamofire.swift
Christian Noon 10 年之前
父節點
當前提交
d666c15620
共有 2 個文件被更改,包括 8 次插入3 次删除
  1. 4 1
      Source/Request.swift
  2. 4 2
      Tests/ResponseTests.swift

+ 4 - 1
Source/Request.swift

@@ -218,9 +218,12 @@ public class Request {
             self.queue = {
                 let operationQueue = NSOperationQueue()
                 operationQueue.maxConcurrentOperationCount = 1
-                operationQueue.qualityOfService = NSQualityOfService.Utility
                 operationQueue.suspended = true
 
+                if operationQueue.respondsToSelector("qualityOfService") {
+                    operationQueue.qualityOfService = NSQualityOfService.Utility
+                }
+
                 return operationQueue
             }()
         }

+ 4 - 2
Tests/ResponseTests.swift

@@ -82,13 +82,14 @@ class AlamofireRedirectResponseTestCase: XCTestCase {
 
         Alamofire.request(.GET, URL)
             .response { (request, response, data, error) in
-                expectation.fulfill()
                 XCTAssertNotNil(request, "request should not be nil")
                 XCTAssertNotNil(response, "response should not be nil")
                 XCTAssertNotNil(data, "data should not be nil")
                 XCTAssertNil(error, "error should be nil")
 
                 XCTAssertEqual(response!.URL!, NSURL(string: "http://www.google.com/")!, "request should have followed a redirect")
+
+                expectation.fulfill()
         }
 
         waitForExpectationsWithTimeout(10) { (error) in
@@ -111,13 +112,14 @@ class AlamofireRedirectResponseTestCase: XCTestCase {
 
         Alamofire.request(.GET, URL)
             .response { request, response, data, error in
-                expectation.fulfill()
                 XCTAssertNotNil(request, "request should not be nil")
                 XCTAssertNotNil(response, "response should not be nil")
                 XCTAssertNotNil(data, "data should not be nil")
                 XCTAssertNil(error, "error should be nil")
 
                 XCTAssertEqual(response!.URL!, NSURL(string: URL)!, "request should not have followed a redirect")
+
+                expectation.fulfill()
         }
 
         waitForExpectationsWithTimeout(10) { (error) in