Style fixes, shorter timeout

mapbox · Apr 7, 2016 · 132908c · 132908c
1 parent dc20df8
commit 132908c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/MapboxDirections/MBDirections.swift b/MapboxDirections/MBDirections.swift
@@ -113,7 +113,7 @@ public class MBDirections: NSObject {
     }
 
     private func taskWithRouter(router: MBDirectionsRouter, completionHandler completion: (MBPoint, [MBPoint], MBPoint, [JSON], NSError?) -> Void, errorHandler: (NSError?) -> Void) -> Request? {
-        let request = Alamofire.request(router).responseJSON { response in
+        return Alamofire.request(router).responseJSON { response in
 
             let error = response.result.error
             let json = response.result.value
@@ -183,7 +183,6 @@ public class MBDirections: NSObject {
 
             completion(source, Array(waypoints), destination, routes, error)
         }
-        return request
     }
 
     public func cancel() {

diff --git a/MapboxDirectionsTests/MapboxDirectionsTests.swift b/MapboxDirectionsTests/MapboxDirectionsTests.swift
@@ -47,7 +47,7 @@ class MapboxDirectionsTests: XCTestCase {
             expectation.fulfill()
         }
 
-        waitForExpectationsWithTimeout(10) { error in
+        waitForExpectationsWithTimeout(2) { error in
             XCTAssertNil(error, "Error: \(error)")
         }
     }