Skip to content

Commit 2d89fc0

Browse files
fixes lint complaints
1 parent de47aa2 commit 2d89fc0

File tree

5 files changed

+22
-16
lines changed

5 files changed

+22
-16
lines changed

Demo/DemoUITests/DemoUITestsLaunchTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import XCTest
22

33
final class DemoUITestsLaunchTests: XCTestCase {
44

5-
override class var runsForEachTargetApplicationUIConfiguration: Bool {
5+
override static var runsForEachTargetApplicationUIConfiguration: Bool {
66

77
true
88
}

Sources/PayPalMessages/PayPalMessageModalViewControllerModel.swift

+5-2
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,11 @@ class PayPalMessageModalViewControllerModel: NSObject, WKNavigationDelegate, WKS
203203

204204
// Exposed internally for tests
205205
func flushUpdates() {
206-
guard let jsonData = try? JSONEncoder().encode(self.makeConfig()),
207-
let jsonString = String(data: jsonData, encoding: .utf8) else { return }
206+
guard let jsonData = try? JSONEncoder().encode(self.makeConfig()) else {
207+
log(.error, "Failed to encode configuration.", for: environment)
208+
return
209+
}
210+
let jsonString = String(decoding: jsonData, as: UTF8.self)
208211

209212
log(.debug, "Update props: \(jsonString)", for: environment)
210213

Tests/PayPalMessagesTests/AnyCodableTests.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final class AnyCodableTests: XCTestCase {
2222
let encoder = JSONEncoder()
2323
let data = try encoder.encode(intValue)
2424

25-
let jsonString = String(data: data, encoding: .utf8)
25+
let jsonString = String(decoding: data, as: UTF8.self)
2626
XCTAssertEqual(jsonString, "42")
2727
}
2828

@@ -34,7 +34,7 @@ final class AnyCodableTests: XCTestCase {
3434
let encoder = JSONEncoder()
3535
let data = try encoder.encode(stringValue)
3636

37-
let jsonString = String(data: data, encoding: .utf8)
37+
let jsonString = String(decoding: data, as: UTF8.self)
3838
XCTAssertEqual(jsonString, "\"Hello, World!\"")
3939
}
4040

@@ -45,7 +45,7 @@ final class AnyCodableTests: XCTestCase {
4545
let encoder = JSONEncoder()
4646
let data = try encoder.encode(boolValue)
4747

48-
let jsonString = String(data: data, encoding: .utf8)
48+
let jsonString = String(decoding: data, as: UTF8.self)
4949
XCTAssertEqual(jsonString, "true")
5050
}
5151

@@ -56,7 +56,7 @@ final class AnyCodableTests: XCTestCase {
5656
let encoder = JSONEncoder()
5757
let data = try encoder.encode(nilValue)
5858

59-
let jsonString = String(data: data, encoding: .utf8)
59+
let jsonString = String(decoding: data, as: UTF8.self)
6060
XCTAssertEqual(jsonString, "null")
6161
}
6262
}

Tests/PayPalMessagesTests/PayPalMessageResponseTests.swift

+4-3
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,12 @@ final class MessageResponseTests: XCTestCase {
5454
}
5555
}
5656
"""
57-
// swiftlint:disable force_unwrapping
58-
.data(using: .utf8)!
57+
guard let jsonData = json.data(using: .utf8) else {
58+
fatalError("Failed to convert string to data")
59+
}
5960

6061
let decoder = JSONDecoder()
61-
let messageResponse = try decoder.decode(MessageResponse.self, from: json)
62+
let messageResponse = try decoder.decode(MessageResponse.self, from: jsonData)
6263

6364
XCTAssertEqual(messageResponse.offerType, .payLaterLongTerm)
6465
XCTAssertEqual(messageResponse.productGroup, .payLater)

Tests/PayPalMessagesTests/ResponseErrorTests.swift

+8-6
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ final class ResponseErrorTests: XCTestCase {
2020
"debug_id": "12345"
2121
}
2222
"""
23-
// swiftlint:disable force_unwrapping
24-
.data(using: .utf8)!
23+
guard let jsonData = json.data(using: .utf8) else {
24+
fatalError("Failed to convert string to data")
25+
}
2526

2627
let decoder = JSONDecoder()
27-
let responseError = try decoder.decode(ResponseError.self, from: json)
28+
let responseError = try decoder.decode(ResponseError.self, from: jsonData)
2829

2930
XCTAssertEqual(responseError.paypalDebugID, "12345")
3031
XCTAssertNil(responseError.issue)
@@ -45,11 +46,12 @@ final class ResponseErrorTests: XCTestCase {
4546
]
4647
}
4748
"""
48-
// swiftlint:disable force_unwrapping
49-
.data(using: .utf8)!
49+
guard let jsonData = json.data(using: .utf8) else {
50+
fatalError("Failed to convert string to data")
51+
}
5052

5153
let decoder = JSONDecoder()
52-
let responseError = try decoder.decode(ResponseError.self, from: json)
54+
let responseError = try decoder.decode(ResponseError.self, from: jsonData)
5355

5456
XCTAssertEqual(responseError.paypalDebugID, "12345")
5557
XCTAssertEqual(responseError.issue, "TEST_ISSUE")

0 commit comments

Comments
 (0)