Merge pull request #74 from immobiliare/bug/70-fix-for-stubber-ignore…

…QueryParameters

#70: HTTP Stubbing: URL matcher incorrectly strips port when using "ignore query parameters" option

Sources/RealHTTP/Client/Internal/Other Structures/Foundation+Extensions/Foundation+Extension.swift

@@ -262,7 +262,7 @@ extension URL {
     /// "https://www.apple.com/v1/test?param=test"
     /// would be "https://www.apple.com/v1/test"
     public var baseString: String? {
-        guard let scheme = scheme, let host = host else { return nil }
+        guard let scheme = scheme, let host = fullHost else { return nil }
         return scheme + "://" + host + path
     }
 
@@ -286,6 +286,16 @@ extension URL {
         }
     }
 
+    // MARK: - Public Properties
+
+    /// Return the complete host along with port (if available).
+    ///
+    /// NOTE: the original `host` method strip the port.
+    public var fullHost: String? {
+        guard let host = host else { return nil }
+        return host + (port != nil ? ":\(port!)" : "")
+    }
+
 }
 
 // MARK: - FileManager

Tests/RealHTTPTests/Requests+Tests.swift

@@ -18,6 +18,24 @@ import XCTest
 import Combine
 @testable import RealHTTP
 
+class StubberTests: XCTestCase {
+
+    /// Test stubber along with port specified.
+    public func test_matchStubberWithExplicitPort() async throws {
+        let stub = HTTPStubRequest()
+            .match(URL: URL(string: "http://localhost:3001/some/path")!)
+            .stub(for: .get) { _, _ in
+                let response = HTTPStubResponse()
+                response.statusCode = .ok
+                return response
+            }
+
+        let matches = stub.matchers[0].matches(request: URLRequest(url: URL(string: "http://localhost:3001/some/path")!), for: stub)
+        XCTAssertTrue(matches, "Failed to match host with port")
+    }
+
+}
+
 class RequestsTests: XCTestCase {
 
     private var observerBag = Set<AnyCancellable>()