code review corrections

This commit is contained in:
Madhas 2018-05-24 12:57:30 +03:00
parent f88c8efb14
commit 3edfe50164
2 changed files with 6 additions and 11 deletions

View File

@ -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

View File

@ -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)