Skip to content

Commit a9606df

Browse files
authored
Align ParseLiveQuery error with ParseError (#175)
* Align ParseLiveQuery error with ParseError * Set patch to zero for this PR only
1 parent 619a3fc commit a9606df

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

.codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ coverage:
44
status:
55
patch:
66
default:
7-
target: auto
7+
target: 0
88
changes: false
99
project:
1010
default:

Sources/ParseSwift/LiveQuery/Messages.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,15 @@ struct EventResponse<T: ParseObject>: LiveQueryable, Codable {
9393
struct ErrorResponse: LiveQueryable, Codable {
9494
let op: OperationErrorResponse // swiftlint:disable:this identifier_name
9595
let code: Int
96-
let error: String
96+
let message: String
9797
let reconnect: Bool
98+
99+
enum CodingKeys: String, CodingKey {
100+
case op // swiftlint:disable:this identifier_name
101+
case code
102+
case message = "error"
103+
case reconnect
104+
}
98105
}
99106

100107
struct PreliminaryMessageResponse: LiveQueryable, Codable {

Sources/ParseSwift/LiveQuery/ParseLiveQuery.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ extension ParseLiveQuery: LiveQuerySocketDelegate {
345345
//Turn LiveQuery error into ParseError
346346
let parseError = ParseError(code: .unknownError,
347347
// swiftlint:disable:next line_length
348-
message: "ParseLiveQuery Error: code: \(error.code), message: \(error.error)")
348+
message: "ParseLiveQuery Error: code: \(error.code), message: \(error.message)")
349349
self.notificationQueue.async {
350350
self.receiveDelegate?.received(parseError)
351351
}

Tests/ParseSwiftTests/ParseLiveQueryTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ class ParseLiveQueryTests: XCTestCase {
280280

281281
func testErrorResponseDecoding() throws {
282282
let expected = "{\"code\":1,\"op\":\"error\",\"error\":\"message\",\"reconnect\":true}"
283-
let message = ErrorResponse(op: .error, code: 1, error: "message", reconnect: true)
283+
let message = ErrorResponse(op: .error, code: 1, message: "message", reconnect: true)
284284
let encoded = try ParseCoding.jsonEncoder()
285285
.encode(message)
286286
let decoded = try XCTUnwrap(String(data: encoded, encoding: .utf8))
@@ -783,7 +783,7 @@ class ParseLiveQueryTests: XCTestCase {
783783
return
784784
}
785785
XCTAssertNotEqual(client.url, url)
786-
let response = ErrorResponse(op: .error, code: 1, error: "message", reconnect: true)
786+
let response = ErrorResponse(op: .error, code: 1, message: "message", reconnect: true)
787787
let encoded = try ParseCoding.jsonEncoder().encode(response)
788788
client.received(encoded)
789789
let expectation1 = XCTestExpectation(description: "Response delegate")
@@ -810,7 +810,7 @@ class ParseLiveQueryTests: XCTestCase {
810810
return
811811
}
812812
XCTAssertNotEqual(client.url, url)
813-
let response = ErrorResponse(op: .error, code: 1, error: "message", reconnect: false)
813+
let response = ErrorResponse(op: .error, code: 1, message: "message", reconnect: false)
814814
let encoded = try ParseCoding.jsonEncoder().encode(response)
815815
client.received(encoded)
816816
let expectation1 = XCTestExpectation(description: "Response delegate")

0 commit comments

Comments
 (0)