Skip to content

Fix: Avoid throwing methods on MockResponse #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bstien merged 2 commits into from
Sep 1, 2025
Merged

Fix: Avoid throwing methods on MockResponse #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec88470
Catch errors from encoding/serialization and log the errors
bstien Sep 1, 2025
7bd129d
Update tests
bstien Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 36 additions & 18 deletions Sources/HTTPMock/Models/MockResponse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,24 @@ extension MockResponse {
delivery: Delivery = .instant,
headers: [String: String] = [:],
jsonEncoder: JSONEncoder = .mockDefault
) throws -> MockResponse {
let data = try jsonEncoder.encode(payload)
return Self.init(
payload: .data(data, contentType: "application/json"),
status: status,
lifetime: lifetime,
delivery: delivery,
headers: headers
)
) -> MockResponse {
do {
let data = try jsonEncoder.encode(payload)
return Self.init(
payload: .data(data, contentType: "application/json"),
status: status,
lifetime: lifetime,
delivery: delivery,
headers: headers
)
} catch {
HTTPMockLog.error("""
Failed to encode payload to JSON data. Fallback to `.empty()`.
Payload: \(payload)
Error: \(error)
""")
return .empty()
}
}

public static func dictionary(
Expand All @@ -63,15 +72,24 @@ extension MockResponse {
lifetime: Lifetime = .single,
delivery: Delivery = .instant,
headers: [String: String] = [:]
) throws -> MockResponse {
let data = try JSONSerialization.data(withJSONObject: payload)
return Self.init(
payload: .data(data, contentType: "application/json"),
status: status,
lifetime: lifetime,
delivery: delivery,
headers: headers
)
) -> MockResponse {
do {
let data = try JSONSerialization.data(withJSONObject: payload)
return Self.init(
payload: .data(data, contentType: "application/json"),
status: status,
lifetime: lifetime,
delivery: delivery,
headers: headers
)
} catch {
HTTPMockLog.error("""
Failed to serialize payload to JSON data. Fallback to `.empty()`.
Payload: \(payload)
Error: \(error)
""")
return .empty()
}
}

public static func plaintext(
Expand Down
4 changes: 2 additions & 2 deletions Tests/HTTPMockTests/HTTPMockTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,13 @@ struct HTTPMockTests {
}

@Test
func itSetsDefaultContentTypeAndAllowsOverride() throws {
func itSetsDefaultContentTypeAndAllowsOverride() {
// `plaintext` default
let plainText = MockResponse.plaintext("hi")
#expect(plainText.headers["Content-Type"] == "text/plain")

// `encodable` default
let encodable = try MockResponse.encodable(DummyData())
let encodable = MockResponse.encodable(DummyData())
#expect(encodable.headers["Content-Type"] == "application/json")

// Override content type via explicit headers
Expand Down