fix url trailing slash & better tests

Author: tib

Sources/SwiftHttp/HttpUrl.swift

@@ -168,6 +168,7 @@ public extension HttpUrl {
         components.host = host
         components.port = port
         var path = "/" + path.joined(separator: "/")
+
         if let resource = resource {
             path += (resource.hasPrefix("/") ? resource : "/" + resource)
         }
@@ -176,9 +177,9 @@ public extension HttpUrl {
                 path += "/"
             }
         }
-        if path.last == "/", !query.isEmpty {
-            path.removeLast()
-        }
+//        if !isTrailingSlashEnabled, path.last == "/", !query.isEmpty {
+//            path.removeLast()
+//        }
         components.path = path
         components.fragment = fragment
         components.queryItems = query.map { .init(name: $0.key, value: $0.value) }

Tests/SwiftHttpTests/Helpers/FeatherApi.swift

@@ -9,17 +9,39 @@ import Foundation
 import SwiftHttp
 
 struct PostApi: HttpCodablePipelineCollection {
+    
+//    struct Failure: Codable {
+//        let message: String
+//    }
 
     let client: HttpClient = UrlSessionHttpClient(log: true)
     let apiBaseUrl = HttpUrl(host: "jsonplaceholder.typicode.com")
-
+    
+    /// NOTE: this API call should return a 404 response
+    func invalidApiCall() async throws -> [Post] {
+        try await decodableRequest(executor: client.dataTask,
+                                   url: apiBaseUrl.path("invalid-posts"),
+                                   method: .get)
+    }
 
     func listPosts() async throws -> [Post] {
         try await decodableRequest(executor: client.dataTask,
                                    url: apiBaseUrl.path("posts"),
                                    method: .get)
     }
 
+    func filterPosts(_ userId: Int) async throws -> [Post] {
+        try await decodableRequest(
+            executor: client.dataTask,
+            url: apiBaseUrl
+                .path("posts")
+                .query([
+                    "userId": String(userId),
+                ]),
+            method: .get)
+    }
+    
+    
     func getPost(_ id: Int) async throws -> Post {
         try await decodableRequest(executor: client.dataTask,
                                    url: apiBaseUrl.path("posts", String(id)),

Tests/SwiftHttpTests/Helpers/PostApi.swift

@@ -10,29 +10,39 @@ import XCTest
 
 final class HttpUrlTests: XCTestCase {
 
-    func testBaseUrl() async throws {
+    func testPaths() async throws {
         let baseUrl = HttpUrl(host: "jsonplaceholder.typicode.com")
 
-        let todosUrl = baseUrl.path("todos")
-        XCTAssertEqual(todosUrl.url.absoluteString, "https://jsonplaceholder.typicode.com/todos/")
-        
         let todoUrl = baseUrl.path("todos", String(1))
         XCTAssertEqual(todoUrl.url.absoluteString, "https://jsonplaceholder.typicode.com/todos/1/")
 
-        let query1Url = baseUrl.path("todos").query("foo", "bar")
-        XCTAssertEqual(query1Url.url.absoluteString, "https://jsonplaceholder.typicode.com/todos?foo=bar")
-        
         let query2Url = baseUrl.path("todos").query([
             "foo": "1",
         ])
-        XCTAssertEqual(query2Url.url.absoluteString, "https://jsonplaceholder.typicode.com/todos?foo=1")
+        XCTAssertEqual(query2Url.url.absoluteString, "https://jsonplaceholder.typicode.com/todos/?foo=1")
     }
 
-    func testTrailingSlash() {
+    func testTrailingSlashEnabled() {
+        let baseUrl = HttpUrl(host: "jsonplaceholder.typicode.com", trailingSlashEnabled: true)
+        
+        let todosUrl = baseUrl.path("todos")
+        XCTAssertEqual(todosUrl.url.absoluteString, "https://jsonplaceholder.typicode.com/todos/")
+
+        let sitemapUrl = baseUrl.path("todos").resource("sitemap.xml")
+        XCTAssertEqual(sitemapUrl.url.absoluteString, "https://jsonplaceholder.typicode.com/todos/sitemap.xml")
+        
+        let query1Url = baseUrl.path("todos").query("foo", "bar")
+        XCTAssertEqual(query1Url.url.absoluteString, "https://jsonplaceholder.typicode.com/todos/?foo=bar")
+    }
+    
+    func testTrailingSlashDisabled() {
         let baseUrl = HttpUrl(host: "jsonplaceholder.typicode.com", trailingSlashEnabled: false)
 
         let todosUrl = baseUrl.path("todos")
         XCTAssertEqual(todosUrl.url.absoluteString, "https://jsonplaceholder.typicode.com/todos")
+        
+        let sitemapUrl = baseUrl.path("todos").resource("sitemap.xml")
+        XCTAssertEqual(sitemapUrl.url.absoluteString, "https://jsonplaceholder.typicode.com/todos/sitemap.xml")
 
         let query1Url = baseUrl.path("todos").query("foo", "bar")
         XCTAssertEqual(query1Url.url.absoluteString, "https://jsonplaceholder.typicode.com/todos?foo=bar")

Tests/SwiftHttpTests/HttpUrlTests.swift

@@ -31,29 +31,22 @@ final class SwiftHttpTests: XCTestCase {
     }
 
     func testError() async throws {
-        let api = FeatherApi()
+        let api = PostApi()
         do {
-            _ = try await api.test()
+            _ = try await api.invalidApiCall()
         }
         catch HttpError.invalidStatusCode(let res) {
-            let decoder = HttpResponseDecoder<FeatherError>(decoder: JSONDecoder())
-            do {
-                let error = try decoder.decode(res.data)
-                print(res.statusCode, error)
-            }
-            catch {
-                print(error.localizedDescription)
-            }
+            XCTAssertEqual(res.statusCode, .notFound)
         }
         catch {
-            print(error.localizedDescription)
+            XCTFail(error.localizedDescription)
         }
     }
 
     func testQueryParams() async throws {
-        let api = FeatherApi()
-        let res = try await api.testQueryParams()
-        XCTAssertEqual(res, "ok")
+        let api = PostApi()
+        let res = try await api.filterPosts(1)
+        XCTAssertEqual(res.count, 10)
     }
 }