1.7.15

dankinsoid · Apr 13, 2024 · 78871a0 · 78871a0
1 parent cfd9dcc
commit 78871a0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/Sources/SwiftAPIClient/Modifiers/RequestModifiers.swift b/Sources/SwiftAPIClient/Modifiers/RequestModifiers.swift
@@ -212,7 +212,6 @@ public extension RequestBuilder where Request == HTTPRequestComponents {
 		modifyRequest { req, configs in
 			let items = try items(configs)
 			guard !items.isEmpty else { return }
-			req.appendPath("")
 			let itemsToAdd: [URLQueryItem]
 			if percentEncoded {
 				itemsToAdd = items

diff --git a/Sources/SwiftAPIClient/Types/HTTPRequestComponents.swift b/Sources/SwiftAPIClient/Types/HTTPRequestComponents.swift
@@ -210,9 +210,6 @@ public struct HTTPRequestComponents: Sendable, Hashable {
 		} else {
 			urlComponents.path += path
 		}
-		if !urlComponents.path.isEmpty, !urlComponents.path.hasSuffix("/") {
-			urlComponents.path += "/"
-		}
 	}
 
 	public mutating func prependPath(
@@ -230,9 +227,6 @@ public struct HTTPRequestComponents: Sendable, Hashable {
 		} else {
 			urlComponents.path = path + urlComponents.path
 		}
-		if !urlComponents.path.isEmpty, !urlComponents.path.hasSuffix("/") {
-			urlComponents.path += "/"
-		}
 	}
 }
 

diff --git a/Tests/SwiftAPIClientTests/Modifiers/RequestModifiersTests.swift b/Tests/SwiftAPIClientTests/Modifiers/RequestModifiersTests.swift
@@ -13,7 +13,7 @@ final class RequestModifiersTests: XCTestCase {
 
 		let modifiedClient = client.path("users", "123")
 
-		try XCTAssertEqual(modifiedClient.request().url?.absoluteString, "https://example.com/users/123/")
+		try XCTAssertEqual(modifiedClient.request().url?.absoluteString, "https://example.com/users/123")
 	}
 
 	func testMethodSetting() throws {
@@ -61,7 +61,7 @@ final class RequestModifiersTests: XCTestCase {
 	func testQueryParametersAdding() throws {
 		let modifiedClient = client.query("page", "some parameter ❤️")
 
-		try XCTAssertEqual(modifiedClient.request().url?.absoluteString, "https://example.com/?page=some%20parameter%20%E2%9D%A4%EF%B8%8F")
+		try XCTAssertEqual(modifiedClient.request().url?.absoluteString, "https://example.com?page=some%20parameter%20%E2%9D%A4%EF%B8%8F")
 	}
 
 	func testBaseURLSetting() throws {
@@ -70,9 +70,7 @@ final class RequestModifiersTests: XCTestCase {
 	}
 
 	func testRemoveSlashIfNeeded() throws {
-		let modifiedClient = client.query("test", "value").modifyRequest {
-            $0.urlComponents.path.removeLast()
-		}
+		let modifiedClient = client.query("test", "value")
 		try XCTAssertEqual(modifiedClient.request().url?.absoluteString, "https://example.com?test=value")
 	}
 

diff --git a/Tests/SwiftAPIClientTests/URLQueryEncoderTests.swift b/Tests/SwiftAPIClientTests/URLQueryEncoderTests.swift
@@ -841,7 +841,7 @@ final class FormURLEncoderTests: XCTestCase {
             .withRequest { components, _ in
                 components.url!
             }
-        XCTAssertEqual(url.absoluteString, "https://example.com/?q=remaster%2520track%3ADoxy%2520artist%3AMiles%2520Davis")
+        XCTAssertEqual(url.absoluteString, "https://example.com?q=remaster%2520track%3ADoxy%2520artist%3AMiles%2520Davis")
     }
 
 	func testThatIllegalASCIICharactersArePercentEscaped() {