From 3edfe50164005062dc14207a772247eebdb9aa1f Mon Sep 17 00:00:00 2001 From: Madhas Date: Thu, 24 May 2018 12:57:30 +0300 Subject: [PATCH] code review corrections --- .../Alamofire/AlamofireRequest+Extensions.swift | 2 -- Tests/NetworkServiceTests.swift | 15 ++++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift b/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift index 9a57ae7f..86b6dd88 100644 --- a/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift +++ b/Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift @@ -28,8 +28,6 @@ typealias ServerResponse = (HTTPURLResponse, Data) public extension Reactive where Base: DataRequest { - //private typealias JSON = [String: Any] - /// Method that serializes response into target object /// /// - Parameter mappingQueue: The dispatch queue to use for mapping diff --git a/Tests/NetworkServiceTests.swift b/Tests/NetworkServiceTests.swift index 6c3228b9..72aa157a 100644 --- a/Tests/NetworkServiceTests.swift +++ b/Tests/NetworkServiceTests.swift @@ -33,7 +33,8 @@ final class NetworkServiceTests: XCTestCase { override func setUp() { super.setUp() - let configuration = NetworkServiceConfiguration(baseUrl: "") + let configuration = NetworkServiceConfiguration(baseUrl: "https://jsonplaceholder.typicode.com", + additionalHttpHeaders: ["Content-Type": "application/json"]) networkService = NetworkService(configuration: configuration) disposeBag = DisposeBag() } @@ -53,8 +54,7 @@ final class NetworkServiceTests: XCTestCase { var receivedModel: Album? var error: Error? let requestCompletedExpectation = expectation(description: "Request completed") - let apiRequest = ApiRequestParameters(url: "https://jsonplaceholder.typicode.com/albums/1", - headers: ["Content-Type": "application/json"]) + let apiRequest = ApiRequestParameters(url: networkService.configuration.baseUrl + "/albums/1") // when networkService.rxRequest(with: apiRequest) @@ -80,8 +80,7 @@ final class NetworkServiceTests: XCTestCase { var response: [Album]? var error: Error? let requestCompletedExpectation = expectation(description: "Request completed") - let apiRequest = ApiRequestParameters(url: "https://jsonplaceholder.typicode.com/albums", - headers: ["Content-Type": "application/json"]) + let apiRequest = ApiRequestParameters(url: networkService.configuration.baseUrl + "/albums") //when networkService.rxRequest(with: apiRequest) @@ -111,8 +110,7 @@ final class NetworkServiceTests: XCTestCase { var receivedModel: Album? var error: Error? let requestCompletedExpectation = expectation(description: "Request completed") - let apiRequest = ApiRequestParameters(url: "https://jsonplaceholder.typicode.com/albums/1", - headers: ["Content-Type": "application/json"]) + let apiRequest = ApiRequestParameters(url: networkService.configuration.baseUrl + "/albums/1") // when networkService.rxRequest(with: apiRequest) @@ -138,8 +136,7 @@ final class NetworkServiceTests: XCTestCase { var receivedModel: AlbumContainer? var error: Error? let requestCompletedExpectation = expectation(description: "Request completed") - let apiRequest = ApiRequestParameters(url: "https://jsonplaceholder.typicode.com/albums", - headers: ["Content-Type": "application/json"]) + let apiRequest = ApiRequestParameters(url: networkService.configuration.baseUrl + "/albums") // when networkService.rxRequest(with: apiRequest)