Skip to content

Commit 5fd888a

Browse files
committed
Merge branch 'develop' of https://github.com/dbsystel/DBNetworkStack into feature/remove-deprecated-code
2 parents 0d925cf + a89d606 commit 5fd888a

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

Source/URLRequest+Init.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extension URLRequest {
3131
/// - path: path to the resource.
3232
/// - baseURL: the base url of the resource.
3333
/// - HTTPMethod: the HTTP method for the request. Defaults to `.GET`
34-
/// - parameters: url parameters for the request. Defaults to `nil`
34+
/// - parameters: url parameters for the request. Defaults to empty dictionary
3535
/// - body: body data payload. Defaults to `nil`
3636
/// - allHTTPHeaderFields: HTTP request header fields. Defaults to `nil`
3737
///
@@ -44,7 +44,7 @@ extension URLRequest {
4444
}
4545

4646
let urlWithParameters: URL
47-
if let parameters = parameters {
47+
if let parameters = parameters, !parameters.isEmpty {
4848
urlWithParameters = url.appending(queryParameters: parameters)
4949
} else {
5050
urlWithParameters = url

Tests/DBNetworkStackTests/URLRequestConvertibleTest.swift

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,19 @@ class URLRequestConvertibleTest: XCTestCase {
6868
XCTAssert(query?.contains(where: { $0.name == "query" && $0.value == "2" }) ?? false)
6969
}
7070

71+
func testNoTrailingQuestionmarkInRequestURL() {
72+
//Given
73+
let path = "http://bahn.de/train"
74+
75+
//When
76+
let request = URLRequest(path: path, baseURL: .defaultMock, parameters: [:])
77+
78+
//Then
79+
if let contains = request.url?.absoluteString.contains("?") {
80+
XCTAssertFalse(contains)
81+
} else {
82+
XCTFail("request seem to have no url")
83+
}
84+
}
85+
7186
}

0 commit comments

Comments
 (0)