Browse Source

Merge branch 'master' into project/multiple_swift_files

# Conflicts:
#	Source/Alamofire.swift
Christian Noon 10 years ago
parent
commit
d666c15620
2 changed files with 8 additions and 3 deletions
  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 = {
             self.queue = {
                 let operationQueue = NSOperationQueue()
                 let operationQueue = NSOperationQueue()
                 operationQueue.maxConcurrentOperationCount = 1
                 operationQueue.maxConcurrentOperationCount = 1
-                operationQueue.qualityOfService = NSQualityOfService.Utility
                 operationQueue.suspended = true
                 operationQueue.suspended = true
 
 
+                if operationQueue.respondsToSelector("qualityOfService") {
+                    operationQueue.qualityOfService = NSQualityOfService.Utility
+                }
+
                 return operationQueue
                 return operationQueue
             }()
             }()
         }
         }

+ 4 - 2
Tests/ResponseTests.swift

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