From f3b52a2362b21b9b870dee50938aa43f17155016 Mon Sep 17 00:00:00 2001 From: Corey Baker Date: Wed, 19 Jan 2022 11:07:30 -0500 Subject: [PATCH 1/4] refactor: add external parameter name to merge --- .../Contents.swift | 4 ++-- .../Contents.swift | 2 +- .../Contents.swift | 2 +- .../Contents.swift | 6 +++--- .../Contents.swift | 2 +- .../Contents.swift | 2 +- .../Contents.swift | 2 +- .../Contents.swift | 2 +- .../Contents.swift | 2 +- .../Contents.swift | 2 +- .../Contents.swift | 2 +- .../Contents.swift | 4 ++-- .../5 - ACL.xcplaygroundpage/Contents.swift | 2 +- .../Contents.swift | 2 +- .../7 - GeoPoint.xcplaygroundpage/Contents.swift | 2 +- .../8 - Pointers.xcplaygroundpage/Contents.swift | 4 ++-- .../9 - Files.xcplaygroundpage/Contents.swift | 2 +- Sources/ParseSwift/API/API+Command.swift | 4 ++-- .../ParseSwift/Objects/ParseInstallation.swift | 10 +++++----- Sources/ParseSwift/Objects/ParseObject.swift | 16 ++++++++-------- Sources/ParseSwift/Objects/ParseUser.swift | 10 +++++----- .../ParseInstallationAsyncTests.swift | 2 +- .../ParseSwiftTests/ParseInstallationTests.swift | 2 +- .../ParseSwiftTests/ParseObjectAsyncTests.swift | 2 +- Tests/ParseSwiftTests/ParseObjectTests.swift | 2 +- Tests/ParseSwiftTests/ParseUserAsyncTests.swift | 2 +- Tests/ParseSwiftTests/ParseUserTests.swift | 2 +- 27 files changed, 48 insertions(+), 48 deletions(-) diff --git a/ParseSwift.playground/Pages/1 - Your first Object.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/1 - Your first Object.xcplaygroundpage/Contents.swift index f4c98cb13..ef7c628f1 100644 --- a/ParseSwift.playground/Pages/1 - Your first Object.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/1 - Your first Object.xcplaygroundpage/Contents.swift @@ -42,7 +42,7 @@ struct GameScore: ParseObject { var points: Int? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { @@ -80,7 +80,7 @@ struct GameData: ParseObject { var bytes: ParseBytes? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if shouldRestoreKey(\.polygon, original: object) { diff --git a/ParseSwift.playground/Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift index 7319682ba..a52646239 100644 --- a/ParseSwift.playground/Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift @@ -112,7 +112,7 @@ struct GameScore: ParseObject { var points: Int? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/ParseSwift.playground/Pages/11 - LiveQuery.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/11 - LiveQuery.xcplaygroundpage/Contents.swift index e49ae8cae..2d05cf146 100644 --- a/ParseSwift.playground/Pages/11 - LiveQuery.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/11 - LiveQuery.xcplaygroundpage/Contents.swift @@ -24,7 +24,7 @@ struct GameScore: ParseObject { var name: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift index 5379d8401..4e026c783 100644 --- a/ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift @@ -32,7 +32,7 @@ struct User: ParseUser { var customKey: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.customKey, original: object) { @@ -55,7 +55,7 @@ struct Role: ParseRole { var name: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.name, original: object) { @@ -78,7 +78,7 @@ struct GameScore: ParseObject { var points: Int? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/ParseSwift.playground/Pages/13 - Operations.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/13 - Operations.xcplaygroundpage/Contents.swift index 92a964ea6..371f94321 100644 --- a/ParseSwift.playground/Pages/13 - Operations.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/13 - Operations.xcplaygroundpage/Contents.swift @@ -26,7 +26,7 @@ struct GameScore: ParseObject { var name: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/ParseSwift.playground/Pages/15 - Custom ObjectId.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/15 - Custom ObjectId.xcplaygroundpage/Contents.swift index fd697cb92..df45f7eaa 100644 --- a/ParseSwift.playground/Pages/15 - Custom ObjectId.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/15 - Custom ObjectId.xcplaygroundpage/Contents.swift @@ -33,7 +33,7 @@ struct GameScore: ParseObject { var points: Int? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/ParseSwift.playground/Pages/17 - SwiftUI - Finding Objects.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/17 - SwiftUI - Finding Objects.xcplaygroundpage/Contents.swift index 06654652f..eb4d2477f 100644 --- a/ParseSwift.playground/Pages/17 - SwiftUI - Finding Objects.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/17 - SwiftUI - Finding Objects.xcplaygroundpage/Contents.swift @@ -34,7 +34,7 @@ struct GameScore: ParseObject { var myFiles: [ParseFile]? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/ParseSwift.playground/Pages/18 - SwiftUI - Finding Objects With Custom ViewModel.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/18 - SwiftUI - Finding Objects With Custom ViewModel.xcplaygroundpage/Contents.swift index 059e9d968..2db49012d 100644 --- a/ParseSwift.playground/Pages/18 - SwiftUI - Finding Objects With Custom ViewModel.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/18 - SwiftUI - Finding Objects With Custom ViewModel.xcplaygroundpage/Contents.swift @@ -34,7 +34,7 @@ struct GameScore: ParseObject { var name: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/ParseSwift.playground/Pages/19 - SwiftUI - LiveQuery.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/19 - SwiftUI - LiveQuery.xcplaygroundpage/Contents.swift index c79743a10..df7fc20cb 100644 --- a/ParseSwift.playground/Pages/19 - SwiftUI - LiveQuery.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/19 - SwiftUI - LiveQuery.xcplaygroundpage/Contents.swift @@ -32,7 +32,7 @@ struct GameScore: ParseObject { var name: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/ParseSwift.playground/Pages/2 - Finding Objects.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/2 - Finding Objects.xcplaygroundpage/Contents.swift index fb5df2e62..aae3d8b4e 100644 --- a/ParseSwift.playground/Pages/2 - Finding Objects.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/2 - Finding Objects.xcplaygroundpage/Contents.swift @@ -27,7 +27,7 @@ struct GameScore: ParseObject { var isHighest: Bool? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift index d95110d40..b3f898563 100644 --- a/ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift @@ -32,7 +32,7 @@ struct User: ParseUser { var customKey: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.customKey, original: object) { diff --git a/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift index 9ce4c2bf5..b6d22d930 100644 --- a/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift @@ -35,7 +35,7 @@ struct User: ParseUser { var allScores: [GameScore]? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.customKey, original: object) { @@ -81,7 +81,7 @@ struct GameScore: ParseObject { var points: Int? = 0 //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/ParseSwift.playground/Pages/5 - ACL.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/5 - ACL.xcplaygroundpage/Contents.swift index d04f21d50..82d616f4c 100644 --- a/ParseSwift.playground/Pages/5 - ACL.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/5 - ACL.xcplaygroundpage/Contents.swift @@ -35,7 +35,7 @@ struct GameScore: ParseObject { var points: Int? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/ParseSwift.playground/Pages/6 - Installation.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/6 - Installation.xcplaygroundpage/Contents.swift index 31fa843ee..da9d930f7 100644 --- a/ParseSwift.playground/Pages/6 - Installation.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/6 - Installation.xcplaygroundpage/Contents.swift @@ -38,7 +38,7 @@ struct Installation: ParseInstallation { var customKey: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.customKey, original: object) { diff --git a/ParseSwift.playground/Pages/7 - GeoPoint.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/7 - GeoPoint.xcplaygroundpage/Contents.swift index 7d8b7e2f3..5b3489a41 100644 --- a/ParseSwift.playground/Pages/7 - GeoPoint.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/7 - GeoPoint.xcplaygroundpage/Contents.swift @@ -27,7 +27,7 @@ struct GameScore: ParseObject { var points: Int? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/ParseSwift.playground/Pages/8 - Pointers.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/8 - Pointers.xcplaygroundpage/Contents.swift index 5ef18160c..b5cb0d8f9 100644 --- a/ParseSwift.playground/Pages/8 - Pointers.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/8 - Pointers.xcplaygroundpage/Contents.swift @@ -28,7 +28,7 @@ struct Book: ParseObject, ParseQueryScorable { var relatedBook: Pointer? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.title, original: object) { @@ -65,7 +65,7 @@ struct Author: ParseObject { var otherBooks: [Book]? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.name, original: object) { diff --git a/ParseSwift.playground/Pages/9 - Files.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/9 - Files.xcplaygroundpage/Contents.swift index f3547875f..1557da627 100644 --- a/ParseSwift.playground/Pages/9 - Files.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/9 - Files.xcplaygroundpage/Contents.swift @@ -28,7 +28,7 @@ struct GameScore: ParseObject { var myData: ParseFile? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/Sources/ParseSwift/API/API+Command.swift b/Sources/ParseSwift/API/API+Command.swift index 350007bc5..b21dcb952 100644 --- a/Sources/ParseSwift/API/API+Command.swift +++ b/Sources/ParseSwift/API/API+Command.swift @@ -431,7 +431,7 @@ internal extension API.Command { original.hasSameObjectId(as: object) else { return object } - return try object.merge(original) + return try object.merge(with: original) } return API.Command(method: .PUT, path: object.endpoint, @@ -457,7 +457,7 @@ internal extension API.Command { original.hasSameObjectId(as: object) else { return object } - return try object.merge(original) + return try object.merge(with: original) } return API.Command(method: .PATCH, path: object.endpoint, diff --git a/Sources/ParseSwift/Objects/ParseInstallation.swift b/Sources/ParseSwift/Objects/ParseInstallation.swift index ec7821f48..ce5cd4c58 100644 --- a/Sources/ParseSwift/Objects/ParseInstallation.swift +++ b/Sources/ParseSwift/Objects/ParseInstallation.swift @@ -96,7 +96,7 @@ public extension ParseInstallation { "_Installation" } - func mergeParse(_ object: Self) throws -> Self { + func mergeParse(with object: Self) throws -> Self { guard hasSameObjectId(as: object) == true else { throw ParseError(code: .unknownError, message: "objectId's of objects don't match") @@ -153,8 +153,8 @@ public extension ParseInstallation { return updatedInstallation } - func merge(_ object: Self) throws -> Self { - try mergeParse(object) + func merge(with object: Self) throws -> Self { + try mergeParse(with: object) } } @@ -778,7 +778,7 @@ extension ParseInstallation { original.hasSameObjectId(as: object) else { return object } - return try object.merge(original) + return try object.merge(with: original) } return API.Command(method: .PUT, path: endpoint, @@ -801,7 +801,7 @@ extension ParseInstallation { original.hasSameObjectId(as: object) else { return object } - return try object.merge(original) + return try object.merge(with: original) } return API.Command(method: .PATCH, path: endpoint, diff --git a/Sources/ParseSwift/Objects/ParseObject.swift b/Sources/ParseSwift/Objects/ParseObject.swift index a9d657bb7..7f26fbcf5 100644 --- a/Sources/ParseSwift/Objects/ParseObject.swift +++ b/Sources/ParseSwift/Objects/ParseObject.swift @@ -77,7 +77,7 @@ public protocol ParseObject: Objectable, /** Merges two `ParseObject`'s with the resulting object consisting of all modified and unchanged Parse properties. - - parameter object: The original installation. + - parameter with: The original object. - returns: The updated installation. - throws: An error of type `ParseError`. - note: This is used in combination with `merge` to only send updated @@ -85,7 +85,7 @@ public protocol ParseObject: Objectable, - warning: You should only call this method and shouldn't implement it directly as it's already implemented for developers to use. */ - func mergeParse(_ object: Self) throws -> Self + func mergeParse(with object: Self) throws -> Self /** Merges two `ParseObject`'s with the resulting object consisting of all modified @@ -103,7 +103,7 @@ public protocol ParseObject: Objectable, var points: Int? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { @@ -113,7 +113,7 @@ public protocol ParseObject: Objectable, } } - - parameter object: The original object. + - parameter with: The original object. - returns: The merged object. - throws: An error of type `ParseError`. - note: Use this in combination with `ParseMutable` to only send updated @@ -124,7 +124,7 @@ public protocol ParseObject: Objectable, in the beginning of your implementation to handle all default Parse properties. In addition, use `shouldRestoreKey` to compare key modifications between objects. */ - func merge(_ object: Self) throws -> Self + func merge(with object: Self) throws -> Self init() } @@ -174,7 +174,7 @@ public extension ParseObject { self[keyPath: key] == nil && original[keyPath: key] != self[keyPath: key] } - func mergeParse(_ object: Self) throws -> Self { + func mergeParse(with object: Self) throws -> Self { guard hasSameObjectId(as: object) == true else { throw ParseError(code: .unknownError, message: "objectId's of objects don't match") @@ -187,8 +187,8 @@ public extension ParseObject { return updated } - func merge(_ object: Self) throws -> Self { - return try mergeParse(object) + func merge(with object: Self) throws -> Self { + return try mergeParse(with: object) } } diff --git a/Sources/ParseSwift/Objects/ParseUser.swift b/Sources/ParseSwift/Objects/ParseUser.swift index f6d1d525f..0adba2231 100644 --- a/Sources/ParseSwift/Objects/ParseUser.swift +++ b/Sources/ParseSwift/Objects/ParseUser.swift @@ -43,7 +43,7 @@ public extension ParseUser { "_User" } - func mergeParse(_ object: Self) throws -> Self { + func mergeParse(with object: Self) throws -> Self { guard hasSameObjectId(as: object) == true else { throw ParseError(code: .unknownError, message: "objectId's of objects do not match") @@ -68,8 +68,8 @@ public extension ParseUser { return updatedUser } - func merge(_ object: Self) throws -> Self { - try mergeParse(object) + func merge(with object: Self) throws -> Self { + try mergeParse(with: object) } } @@ -1128,7 +1128,7 @@ extension ParseUser { original.hasSameObjectId(as: object) else { return object } - return try object.merge(original) + return try object.merge(with: original) } return API.Command(method: .PUT, path: endpoint, @@ -1166,7 +1166,7 @@ extension ParseUser { original.hasSameObjectId(as: object) else { return object } - return try object.merge(original) + return try object.merge(with: original) } return API.Command(method: .PATCH, path: endpoint, diff --git a/Tests/ParseSwiftTests/ParseInstallationAsyncTests.swift b/Tests/ParseSwiftTests/ParseInstallationAsyncTests.swift index 346ed35bb..f80512560 100644 --- a/Tests/ParseSwiftTests/ParseInstallationAsyncTests.swift +++ b/Tests/ParseSwiftTests/ParseInstallationAsyncTests.swift @@ -88,7 +88,7 @@ class ParseInstallationAsyncTests: XCTestCase { // swiftlint:disable:this type_b var customKey: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.customKey, original: object) { diff --git a/Tests/ParseSwiftTests/ParseInstallationTests.swift b/Tests/ParseSwiftTests/ParseInstallationTests.swift index 8c70fb639..b7b8d52e0 100644 --- a/Tests/ParseSwiftTests/ParseInstallationTests.swift +++ b/Tests/ParseSwiftTests/ParseInstallationTests.swift @@ -84,7 +84,7 @@ class ParseInstallationTests: XCTestCase { // swiftlint:disable:this type_body_l var customKey: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.customKey, original: object) { diff --git a/Tests/ParseSwiftTests/ParseObjectAsyncTests.swift b/Tests/ParseSwiftTests/ParseObjectAsyncTests.swift index ea3bfc59a..100a450a2 100644 --- a/Tests/ParseSwiftTests/ParseObjectAsyncTests.swift +++ b/Tests/ParseSwiftTests/ParseObjectAsyncTests.swift @@ -30,7 +30,7 @@ class ParseObjectAsyncTests: XCTestCase { // swiftlint:disable:this type_body_le var player: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/Tests/ParseSwiftTests/ParseObjectTests.swift b/Tests/ParseSwiftTests/ParseObjectTests.swift index 4799ba063..248a9ce13 100644 --- a/Tests/ParseSwiftTests/ParseObjectTests.swift +++ b/Tests/ParseSwiftTests/ParseObjectTests.swift @@ -60,7 +60,7 @@ class ParseObjectTests: XCTestCase { // swiftlint:disable:this type_body_length } //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.points, original: object) { diff --git a/Tests/ParseSwiftTests/ParseUserAsyncTests.swift b/Tests/ParseSwiftTests/ParseUserAsyncTests.swift index 497a969b3..037698e73 100644 --- a/Tests/ParseSwiftTests/ParseUserAsyncTests.swift +++ b/Tests/ParseSwiftTests/ParseUserAsyncTests.swift @@ -36,7 +36,7 @@ class ParseUserAsyncTests: XCTestCase { // swiftlint:disable:this type_body_leng var customKey: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.customKey, original: object) { diff --git a/Tests/ParseSwiftTests/ParseUserTests.swift b/Tests/ParseSwiftTests/ParseUserTests.swift index ff83e3384..6a6368bd5 100644 --- a/Tests/ParseSwiftTests/ParseUserTests.swift +++ b/Tests/ParseSwiftTests/ParseUserTests.swift @@ -32,7 +32,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length var customKey: String? //: Implement your own version of merge - func merge(_ object: Self) throws -> Self { + func merge(with object: Self) throws -> Self { var updated = try mergeParse(object) if updated.shouldRestoreKey(\.customKey, original: object) { From 01efd9a697b412b1364200073b4e39ef3a9f3cbf Mon Sep 17 00:00:00 2001 From: Corey Baker Date: Wed, 19 Jan 2022 11:26:43 -0500 Subject: [PATCH 2/4] fix tests --- Tests/ParseSwiftTests/ParseInstallationAsyncTests.swift | 2 +- Tests/ParseSwiftTests/ParseInstallationTests.swift | 8 ++++---- Tests/ParseSwiftTests/ParseObjectAsyncTests.swift | 2 +- Tests/ParseSwiftTests/ParseObjectTests.swift | 8 ++++---- Tests/ParseSwiftTests/ParseUserAsyncTests.swift | 2 +- Tests/ParseSwiftTests/ParseUserTests.swift | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Tests/ParseSwiftTests/ParseInstallationAsyncTests.swift b/Tests/ParseSwiftTests/ParseInstallationAsyncTests.swift index f80512560..3d925f6ba 100644 --- a/Tests/ParseSwiftTests/ParseInstallationAsyncTests.swift +++ b/Tests/ParseSwiftTests/ParseInstallationAsyncTests.swift @@ -89,7 +89,7 @@ class ParseInstallationAsyncTests: XCTestCase { // swiftlint:disable:this type_b //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.customKey, original: object) { updated.customKey = object.customKey diff --git a/Tests/ParseSwiftTests/ParseInstallationTests.swift b/Tests/ParseSwiftTests/ParseInstallationTests.swift index b7b8d52e0..a668c15ad 100644 --- a/Tests/ParseSwiftTests/ParseInstallationTests.swift +++ b/Tests/ParseSwiftTests/ParseInstallationTests.swift @@ -85,7 +85,7 @@ class ParseInstallationTests: XCTestCase { // swiftlint:disable:this type_body_l //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.customKey, original: object) { updated.customKey = object.customKey @@ -283,7 +283,7 @@ class ParseInstallationTests: XCTestCase { // swiftlint:disable:this type_body_l updated.badge = 1 updated.deviceToken = "12345" updated.customKey = "newKey" - let merged = try updated.merge(original) + let merged = try updated.merge(with: original) XCTAssertEqual(merged.customKey, updated.customKey) XCTAssertEqual(merged.badge, updated.badge) XCTAssertEqual(merged.deviceType, original.deviceType) @@ -319,7 +319,7 @@ class ParseInstallationTests: XCTestCase { // swiftlint:disable:this type_body_l var updated = original.mergeable updated.updatedAt = Calendar.current.date(byAdding: .init(day: 1), to: Date()) updated.customKey = "newKey" - let merged = try updated.merge(original) + let merged = try updated.merge(with: original) XCTAssertEqual(merged.customKey, updated.customKey) XCTAssertEqual(merged.badge, original.badge) XCTAssertEqual(merged.deviceType, original.deviceType) @@ -342,7 +342,7 @@ class ParseInstallationTests: XCTestCase { // swiftlint:disable:this type_body_l installation.objectId = "yolo" var installation2 = installation installation2.objectId = "nolo" - XCTAssertThrowsError(try installation2.merge(installation)) + XCTAssertThrowsError(try installation2.merge(with: installation)) } func testUpdate() { diff --git a/Tests/ParseSwiftTests/ParseObjectAsyncTests.swift b/Tests/ParseSwiftTests/ParseObjectAsyncTests.swift index 100a450a2..93bf04038 100644 --- a/Tests/ParseSwiftTests/ParseObjectAsyncTests.swift +++ b/Tests/ParseSwiftTests/ParseObjectAsyncTests.swift @@ -31,7 +31,7 @@ class ParseObjectAsyncTests: XCTestCase { // swiftlint:disable:this type_body_le //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/Tests/ParseSwiftTests/ParseObjectTests.swift b/Tests/ParseSwiftTests/ParseObjectTests.swift index 248a9ce13..5a8e52b13 100644 --- a/Tests/ParseSwiftTests/ParseObjectTests.swift +++ b/Tests/ParseSwiftTests/ParseObjectTests.swift @@ -61,7 +61,7 @@ class ParseObjectTests: XCTestCase { // swiftlint:disable:this type_body_length //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points @@ -393,7 +393,7 @@ class ParseObjectTests: XCTestCase { // swiftlint:disable:this type_body_length updated.points = 30 updated.player = "moreFire" updated.levels = [level, level2] - let merged = try updated.merge(score) + let merged = try updated.merge(with: score) XCTAssertEqual(merged.points, updated.points) XCTAssertEqual(merged.player, updated.player) XCTAssertEqual(merged.level, score.level) @@ -412,7 +412,7 @@ class ParseObjectTests: XCTestCase { // swiftlint:disable:this type_body_length var updated = score.mergeable updated.updatedAt = Calendar.current.date(byAdding: .init(day: 1), to: Date()) updated.name = "moreFire" - let merged = try updated.merge(score) + let merged = try updated.merge(with: score) XCTAssertEqual(merged.name, updated.name) XCTAssertEqual(merged.gameScore, score.gameScore) XCTAssertEqual(merged.gameScores, score.gameScores) @@ -424,7 +424,7 @@ class ParseObjectTests: XCTestCase { // swiftlint:disable:this type_body_length score.objectId = "yolo" var score2 = score score2.objectId = "nolo" - XCTAssertThrowsError(try score2.merge(score)) + XCTAssertThrowsError(try score2.merge(with: score)) } func testFetchCommand() { diff --git a/Tests/ParseSwiftTests/ParseUserAsyncTests.swift b/Tests/ParseSwiftTests/ParseUserAsyncTests.swift index 037698e73..e6c43eac7 100644 --- a/Tests/ParseSwiftTests/ParseUserAsyncTests.swift +++ b/Tests/ParseSwiftTests/ParseUserAsyncTests.swift @@ -37,7 +37,7 @@ class ParseUserAsyncTests: XCTestCase { // swiftlint:disable:this type_body_leng //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.customKey, original: object) { updated.customKey = object.customKey diff --git a/Tests/ParseSwiftTests/ParseUserTests.swift b/Tests/ParseSwiftTests/ParseUserTests.swift index 6a6368bd5..9db673050 100644 --- a/Tests/ParseSwiftTests/ParseUserTests.swift +++ b/Tests/ParseSwiftTests/ParseUserTests.swift @@ -33,7 +33,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.customKey, original: object) { updated.customKey = object.customKey @@ -133,7 +133,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length updated.email = "swift@parse.com" updated.username = "12345" updated.customKey = "newKey" - let merged = try updated.merge(original) + let merged = try updated.merge(with: original) XCTAssertEqual(merged.customKey, updated.customKey) XCTAssertEqual(merged.email, updated.email) XCTAssertEqual(merged.emailVerified, original.emailVerified) @@ -164,7 +164,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length var updated = original.mergeable updated.updatedAt = Calendar.current.date(byAdding: .init(day: 1), to: Date()) updated.customKey = "newKey" - let merged = try updated.merge(original) + let merged = try updated.merge(with: original) XCTAssertEqual(merged.customKey, updated.customKey) XCTAssertEqual(merged.email, original.email) XCTAssertEqual(merged.emailVerified, original.emailVerified) @@ -180,7 +180,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length user.objectId = "yolo" var user2 = user user2.objectId = "nolo" - XCTAssertThrowsError(try user2.merge(user)) + XCTAssertThrowsError(try user2.merge(with: user)) } func testFetchCommand() { From 55648c677b35a6e406b8f84e1087ba9be0f53a3c Mon Sep 17 00:00:00 2001 From: Corey Baker Date: Wed, 19 Jan 2022 11:45:46 -0500 Subject: [PATCH 3/4] Fix playgrounds --- .../1 - Your first Object.xcplaygroundpage/Contents.swift | 4 ++-- .../Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift | 2 +- .../Pages/11 - LiveQuery.xcplaygroundpage/Contents.swift | 2 +- .../Contents.swift | 6 +++--- .../Pages/13 - Operations.xcplaygroundpage/Contents.swift | 2 +- .../15 - Custom ObjectId.xcplaygroundpage/Contents.swift | 2 +- .../Contents.swift | 2 +- .../Contents.swift | 2 +- .../Contents.swift | 2 +- .../2 - Finding Objects.xcplaygroundpage/Contents.swift | 2 +- .../3 - User - Sign Up.xcplaygroundpage/Contents.swift | 2 +- .../4 - User - Continued.xcplaygroundpage/Contents.swift | 4 ++-- .../Pages/5 - ACL.xcplaygroundpage/Contents.swift | 2 +- .../Pages/6 - Installation.xcplaygroundpage/Contents.swift | 2 +- .../Pages/7 - GeoPoint.xcplaygroundpage/Contents.swift | 2 +- .../Pages/8 - Pointers.xcplaygroundpage/Contents.swift | 4 ++-- .../Pages/9 - Files.xcplaygroundpage/Contents.swift | 2 +- Sources/ParseSwift/Objects/ParseObject.swift | 2 +- Sources/ParseSwift/Objects/ParseUser.swift | 3 +-- 19 files changed, 24 insertions(+), 25 deletions(-) diff --git a/ParseSwift.playground/Pages/1 - Your first Object.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/1 - Your first Object.xcplaygroundpage/Contents.swift index ef7c628f1..bc36acbb8 100644 --- a/ParseSwift.playground/Pages/1 - Your first Object.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/1 - Your first Object.xcplaygroundpage/Contents.swift @@ -43,7 +43,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points @@ -81,7 +81,7 @@ struct GameData: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if shouldRestoreKey(\.polygon, original: object) { updated.polygon = object.polygon diff --git a/ParseSwift.playground/Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift index a52646239..51067e8e3 100644 --- a/ParseSwift.playground/Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift @@ -113,7 +113,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/ParseSwift.playground/Pages/11 - LiveQuery.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/11 - LiveQuery.xcplaygroundpage/Contents.swift index 2d05cf146..52188844f 100644 --- a/ParseSwift.playground/Pages/11 - LiveQuery.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/11 - LiveQuery.xcplaygroundpage/Contents.swift @@ -25,7 +25,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift index 4e026c783..a4a76420e 100644 --- a/ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift @@ -33,7 +33,7 @@ struct User: ParseUser { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.customKey, original: object) { updated.customKey = object.customKey @@ -56,7 +56,7 @@ struct Role: ParseRole { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.name, original: object) { updated.name = object.name @@ -79,7 +79,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/ParseSwift.playground/Pages/13 - Operations.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/13 - Operations.xcplaygroundpage/Contents.swift index 371f94321..717e77053 100644 --- a/ParseSwift.playground/Pages/13 - Operations.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/13 - Operations.xcplaygroundpage/Contents.swift @@ -27,7 +27,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/ParseSwift.playground/Pages/15 - Custom ObjectId.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/15 - Custom ObjectId.xcplaygroundpage/Contents.swift index df45f7eaa..50e3f03a1 100644 --- a/ParseSwift.playground/Pages/15 - Custom ObjectId.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/15 - Custom ObjectId.xcplaygroundpage/Contents.swift @@ -34,7 +34,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/ParseSwift.playground/Pages/17 - SwiftUI - Finding Objects.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/17 - SwiftUI - Finding Objects.xcplaygroundpage/Contents.swift index eb4d2477f..df3d1ba93 100644 --- a/ParseSwift.playground/Pages/17 - SwiftUI - Finding Objects.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/17 - SwiftUI - Finding Objects.xcplaygroundpage/Contents.swift @@ -35,7 +35,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/ParseSwift.playground/Pages/18 - SwiftUI - Finding Objects With Custom ViewModel.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/18 - SwiftUI - Finding Objects With Custom ViewModel.xcplaygroundpage/Contents.swift index 2db49012d..36c5775fa 100644 --- a/ParseSwift.playground/Pages/18 - SwiftUI - Finding Objects With Custom ViewModel.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/18 - SwiftUI - Finding Objects With Custom ViewModel.xcplaygroundpage/Contents.swift @@ -35,7 +35,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/ParseSwift.playground/Pages/19 - SwiftUI - LiveQuery.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/19 - SwiftUI - LiveQuery.xcplaygroundpage/Contents.swift index df7fc20cb..8bd335375 100644 --- a/ParseSwift.playground/Pages/19 - SwiftUI - LiveQuery.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/19 - SwiftUI - LiveQuery.xcplaygroundpage/Contents.swift @@ -33,7 +33,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/ParseSwift.playground/Pages/2 - Finding Objects.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/2 - Finding Objects.xcplaygroundpage/Contents.swift index aae3d8b4e..b25207abe 100644 --- a/ParseSwift.playground/Pages/2 - Finding Objects.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/2 - Finding Objects.xcplaygroundpage/Contents.swift @@ -28,7 +28,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift index b3f898563..5beef7a12 100644 --- a/ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift @@ -33,7 +33,7 @@ struct User: ParseUser { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.customKey, original: object) { updated.customKey = object.customKey diff --git a/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift index b6d22d930..3d69a1258 100644 --- a/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift @@ -36,7 +36,7 @@ struct User: ParseUser { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.customKey, original: object) { updated.customKey = object.customKey @@ -82,7 +82,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/ParseSwift.playground/Pages/5 - ACL.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/5 - ACL.xcplaygroundpage/Contents.swift index 82d616f4c..f63d07b4c 100644 --- a/ParseSwift.playground/Pages/5 - ACL.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/5 - ACL.xcplaygroundpage/Contents.swift @@ -36,7 +36,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/ParseSwift.playground/Pages/6 - Installation.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/6 - Installation.xcplaygroundpage/Contents.swift index da9d930f7..13b9bb705 100644 --- a/ParseSwift.playground/Pages/6 - Installation.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/6 - Installation.xcplaygroundpage/Contents.swift @@ -39,7 +39,7 @@ struct Installation: ParseInstallation { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.customKey, original: object) { updated.customKey = object.customKey diff --git a/ParseSwift.playground/Pages/7 - GeoPoint.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/7 - GeoPoint.xcplaygroundpage/Contents.swift index 5b3489a41..7d7843243 100644 --- a/ParseSwift.playground/Pages/7 - GeoPoint.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/7 - GeoPoint.xcplaygroundpage/Contents.swift @@ -28,7 +28,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/ParseSwift.playground/Pages/8 - Pointers.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/8 - Pointers.xcplaygroundpage/Contents.swift index b5cb0d8f9..d1b13d722 100644 --- a/ParseSwift.playground/Pages/8 - Pointers.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/8 - Pointers.xcplaygroundpage/Contents.swift @@ -29,7 +29,7 @@ struct Book: ParseObject, ParseQueryScorable { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.title, original: object) { updated.title = object.title @@ -66,7 +66,7 @@ struct Author: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.name, original: object) { updated.name = object.name diff --git a/ParseSwift.playground/Pages/9 - Files.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/9 - Files.xcplaygroundpage/Contents.swift index 1557da627..1b653032f 100644 --- a/ParseSwift.playground/Pages/9 - Files.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/9 - Files.xcplaygroundpage/Contents.swift @@ -29,7 +29,7 @@ struct GameScore: ParseObject { //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/Sources/ParseSwift/Objects/ParseObject.swift b/Sources/ParseSwift/Objects/ParseObject.swift index 7f26fbcf5..7e2568f5c 100644 --- a/Sources/ParseSwift/Objects/ParseObject.swift +++ b/Sources/ParseSwift/Objects/ParseObject.swift @@ -104,7 +104,7 @@ public protocol ParseObject: Objectable, //: Implement your own version of merge func merge(with object: Self) throws -> Self { - var updated = try mergeParse(object) + var updated = try mergeParse(with: object) if updated.shouldRestoreKey(\.points, original: object) { updated.points = object.points diff --git a/Sources/ParseSwift/Objects/ParseUser.swift b/Sources/ParseSwift/Objects/ParseUser.swift index 0adba2231..0e867edb3 100644 --- a/Sources/ParseSwift/Objects/ParseUser.swift +++ b/Sources/ParseSwift/Objects/ParseUser.swift @@ -246,8 +246,7 @@ extension ParseUser { path: .login, body: body) { (data) -> Self in let sessionToken = try ParseCoding.jsonDecoder().decode(LoginSignupResponse.self, from: data).sessionToken - var user = try ParseCoding.jsonDecoder().decode(Self.self, from: data) - user.username = username + let user = try ParseCoding.jsonDecoder().decode(Self.self, from: data) Self.currentContainer = .init( currentUser: user, From fd19bedd8ec46d52144bc0585ec42b2113e091e3 Mon Sep 17 00:00:00 2001 From: Corey Baker Date: Wed, 19 Jan 2022 12:13:39 -0500 Subject: [PATCH 4/4] fix auth tests --- .../Contents.swift | 2 +- Tests/ParseSwiftTests/ParseAppleAsyncTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseAppleCombineTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseAppleTests.swift | 6 +++--- .../ParseAuthenticationAsyncTests.swift | 2 +- .../ParseAuthenticationCombineTests.swift | 2 +- Tests/ParseSwiftTests/ParseFacebookAsyncTests.swift | 10 +++++----- Tests/ParseSwiftTests/ParseFacebookCombineTests.swift | 10 +++++----- Tests/ParseSwiftTests/ParseFacebookTests.swift | 10 +++++----- Tests/ParseSwiftTests/ParseGitHubCombineTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseGitHubTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseGoogleCombineTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseGoogleTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseLDAPAsyncTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseLDAPCombineTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseLDAPTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseLinkedInCombineTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseLinkedInTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseTwitterAsyncTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseTwitterCombineTests.swift | 6 +++--- Tests/ParseSwiftTests/ParseTwitterTests.swift | 6 +++--- 21 files changed, 63 insertions(+), 63 deletions(-) diff --git a/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift index 3d69a1258..3c4683768 100644 --- a/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift @@ -244,7 +244,7 @@ User.anonymous.login { result in } //: Convert the anonymous user to a real new user. -var currentUser2 = User.current?.mergeable +var currentUser2 = User.current currentUser2?.username = "bye" currentUser2?.password = "world" currentUser2?.signup { result in diff --git a/Tests/ParseSwiftTests/ParseAppleAsyncTests.swift b/Tests/ParseSwiftTests/ParseAppleAsyncTests.swift index b133a7599..e94a14fbf 100644 --- a/Tests/ParseSwiftTests/ParseAppleAsyncTests.swift +++ b/Tests/ParseSwiftTests/ParseAppleAsyncTests.swift @@ -207,7 +207,7 @@ class ParseAppleAsyncTests: XCTestCase { // swiftlint:disable:this type_body_len let user = try await User.apple.link(user: "testing", identityToken: tokenData) XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.apple.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -240,7 +240,7 @@ class ParseAppleAsyncTests: XCTestCase { // swiftlint:disable:this type_body_len "token": "test"]) XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.apple.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -283,7 +283,7 @@ class ParseAppleAsyncTests: XCTestCase { // swiftlint:disable:this type_body_len let user = try await User.apple.unlink() XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.apple.isLinked) } diff --git a/Tests/ParseSwiftTests/ParseAppleCombineTests.swift b/Tests/ParseSwiftTests/ParseAppleCombineTests.swift index 10da1b71b..d8555cfc6 100644 --- a/Tests/ParseSwiftTests/ParseAppleCombineTests.swift +++ b/Tests/ParseSwiftTests/ParseAppleCombineTests.swift @@ -248,7 +248,7 @@ class ParseAppleCombineTests: XCTestCase { // swiftlint:disable:this type_body_l XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.apple.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -296,7 +296,7 @@ class ParseAppleCombineTests: XCTestCase { // swiftlint:disable:this type_body_l XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.apple.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -354,7 +354,7 @@ class ParseAppleCombineTests: XCTestCase { // swiftlint:disable:this type_body_l XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.apple.isLinked) }) diff --git a/Tests/ParseSwiftTests/ParseAppleTests.swift b/Tests/ParseSwiftTests/ParseAppleTests.swift index c651ebbe1..fe90773d8 100644 --- a/Tests/ParseSwiftTests/ParseAppleTests.swift +++ b/Tests/ParseSwiftTests/ParseAppleTests.swift @@ -422,7 +422,7 @@ class ParseAppleTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.apple.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -475,7 +475,7 @@ class ParseAppleTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.apple.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -546,7 +546,7 @@ class ParseAppleTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.apple.isLinked) case .failure(let error): diff --git a/Tests/ParseSwiftTests/ParseAuthenticationAsyncTests.swift b/Tests/ParseSwiftTests/ParseAuthenticationAsyncTests.swift index 2f73ef4dd..b04c2046b 100644 --- a/Tests/ParseSwiftTests/ParseAuthenticationAsyncTests.swift +++ b/Tests/ParseSwiftTests/ParseAuthenticationAsyncTests.swift @@ -220,7 +220,7 @@ class ParseAuthenticationAsyncTests: XCTestCase { // swiftlint:disable:this type let user = try await User.link(type, authData: ["id": "yolo"]) XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) } } diff --git a/Tests/ParseSwiftTests/ParseAuthenticationCombineTests.swift b/Tests/ParseSwiftTests/ParseAuthenticationCombineTests.swift index ebf465945..9def7e125 100644 --- a/Tests/ParseSwiftTests/ParseAuthenticationCombineTests.swift +++ b/Tests/ParseSwiftTests/ParseAuthenticationCombineTests.swift @@ -244,7 +244,7 @@ class ParseAuthenticationCombineTests: XCTestCase { XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) }) publisher.store(in: &subscriptions) diff --git a/Tests/ParseSwiftTests/ParseFacebookAsyncTests.swift b/Tests/ParseSwiftTests/ParseFacebookAsyncTests.swift index cbfced4f0..2deb89f3c 100644 --- a/Tests/ParseSwiftTests/ParseFacebookAsyncTests.swift +++ b/Tests/ParseSwiftTests/ParseFacebookAsyncTests.swift @@ -240,7 +240,7 @@ class ParseFacebookAsyncTests: XCTestCase { // swiftlint:disable:this type_body_ authenticationToken: "authenticationToken") XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.facebook.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -274,7 +274,7 @@ class ParseFacebookAsyncTests: XCTestCase { // swiftlint:disable:this type_body_ accessToken: "accessToken") XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.facebook.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -312,7 +312,7 @@ class ParseFacebookAsyncTests: XCTestCase { // swiftlint:disable:this type_body_ let user = try await User.facebook.link(authData: authData) XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.facebook.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -352,7 +352,7 @@ class ParseFacebookAsyncTests: XCTestCase { // swiftlint:disable:this type_body_ let user = try await User.facebook.unlink() XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.facebook.isLinked) } @@ -391,7 +391,7 @@ class ParseFacebookAsyncTests: XCTestCase { // swiftlint:disable:this type_body_ let user = try await User.facebook.unlink() XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.facebook.isLinked) } diff --git a/Tests/ParseSwiftTests/ParseFacebookCombineTests.swift b/Tests/ParseSwiftTests/ParseFacebookCombineTests.swift index fa86f2995..b09426c42 100644 --- a/Tests/ParseSwiftTests/ParseFacebookCombineTests.swift +++ b/Tests/ParseSwiftTests/ParseFacebookCombineTests.swift @@ -288,7 +288,7 @@ class ParseFacebookCombineTests: XCTestCase { // swiftlint:disable:this type_bod XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.facebook.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -335,7 +335,7 @@ class ParseFacebookCombineTests: XCTestCase { // swiftlint:disable:this type_bod XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.facebook.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -386,7 +386,7 @@ class ParseFacebookCombineTests: XCTestCase { // swiftlint:disable:this type_bod XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.facebook.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -439,7 +439,7 @@ class ParseFacebookCombineTests: XCTestCase { // swiftlint:disable:this type_bod XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.facebook.isLinked) }) @@ -491,7 +491,7 @@ class ParseFacebookCombineTests: XCTestCase { // swiftlint:disable:this type_bod XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.facebook.isLinked) }) diff --git a/Tests/ParseSwiftTests/ParseFacebookTests.swift b/Tests/ParseSwiftTests/ParseFacebookTests.swift index fc2567c89..60a0ff4b8 100644 --- a/Tests/ParseSwiftTests/ParseFacebookTests.swift +++ b/Tests/ParseSwiftTests/ParseFacebookTests.swift @@ -603,7 +603,7 @@ class ParseFacebookTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.facebook.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -647,7 +647,7 @@ class ParseFacebookTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.facebook.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -695,7 +695,7 @@ class ParseFacebookTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.facebook.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -765,7 +765,7 @@ class ParseFacebookTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.facebook.isLinked) case .failure(let error): @@ -813,7 +813,7 @@ class ParseFacebookTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.facebook.isLinked) case .failure(let error): diff --git a/Tests/ParseSwiftTests/ParseGitHubCombineTests.swift b/Tests/ParseSwiftTests/ParseGitHubCombineTests.swift index 542a82c36..fb76d31e5 100644 --- a/Tests/ParseSwiftTests/ParseGitHubCombineTests.swift +++ b/Tests/ParseSwiftTests/ParseGitHubCombineTests.swift @@ -239,7 +239,7 @@ class ParseGitHubCombineTests: XCTestCase { // swiftlint:disable:this type_body_ XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.github.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -288,7 +288,7 @@ class ParseGitHubCombineTests: XCTestCase { // swiftlint:disable:this type_body_ XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.github.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -341,7 +341,7 @@ class ParseGitHubCombineTests: XCTestCase { // swiftlint:disable:this type_body_ XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.github.isLinked) }) diff --git a/Tests/ParseSwiftTests/ParseGitHubTests.swift b/Tests/ParseSwiftTests/ParseGitHubTests.swift index 5afa3da85..17289ce3d 100644 --- a/Tests/ParseSwiftTests/ParseGitHubTests.swift +++ b/Tests/ParseSwiftTests/ParseGitHubTests.swift @@ -333,7 +333,7 @@ class ParseGitHubTests: XCTestCase { // swiftlint:disable:this type_body_length accessToken: "that") XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.github.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -370,7 +370,7 @@ class ParseGitHubTests: XCTestCase { // swiftlint:disable:this type_body_length let user = try await User.github.link(authData: authData) XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.github.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -424,7 +424,7 @@ class ParseGitHubTests: XCTestCase { // swiftlint:disable:this type_body_length let user = try await User.github.unlink() XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.github.isLinked) } diff --git a/Tests/ParseSwiftTests/ParseGoogleCombineTests.swift b/Tests/ParseSwiftTests/ParseGoogleCombineTests.swift index 314ffed97..1713a6297 100644 --- a/Tests/ParseSwiftTests/ParseGoogleCombineTests.swift +++ b/Tests/ParseSwiftTests/ParseGoogleCombineTests.swift @@ -239,7 +239,7 @@ class ParseGoogleCombineTests: XCTestCase { // swiftlint:disable:this type_body_ XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.google.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -288,7 +288,7 @@ class ParseGoogleCombineTests: XCTestCase { // swiftlint:disable:this type_body_ XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.google.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -341,7 +341,7 @@ class ParseGoogleCombineTests: XCTestCase { // swiftlint:disable:this type_body_ XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.google.isLinked) }) diff --git a/Tests/ParseSwiftTests/ParseGoogleTests.swift b/Tests/ParseSwiftTests/ParseGoogleTests.swift index 60779a872..04f3f9e41 100644 --- a/Tests/ParseSwiftTests/ParseGoogleTests.swift +++ b/Tests/ParseSwiftTests/ParseGoogleTests.swift @@ -349,7 +349,7 @@ class ParseGoogleTests: XCTestCase { // swiftlint:disable:this type_body_length accessToken: "that") XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.google.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -386,7 +386,7 @@ class ParseGoogleTests: XCTestCase { // swiftlint:disable:this type_body_length let user = try await User.google.link(authData: authData) XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.google.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -440,7 +440,7 @@ class ParseGoogleTests: XCTestCase { // swiftlint:disable:this type_body_length let user = try await User.google.unlink() XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.google.isLinked) } diff --git a/Tests/ParseSwiftTests/ParseLDAPAsyncTests.swift b/Tests/ParseSwiftTests/ParseLDAPAsyncTests.swift index d2ce5910d..2f2ce3311 100644 --- a/Tests/ParseSwiftTests/ParseLDAPAsyncTests.swift +++ b/Tests/ParseSwiftTests/ParseLDAPAsyncTests.swift @@ -200,7 +200,7 @@ class ParseLDAPAsyncTests: XCTestCase { // swiftlint:disable:this type_body_leng let user = try await User.ldap.link(id: "testing", password: "password") XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.ldap.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -235,7 +235,7 @@ class ParseLDAPAsyncTests: XCTestCase { // swiftlint:disable:this type_body_leng let user = try await User.ldap.link(authData: authData) XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.ldap.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -274,7 +274,7 @@ class ParseLDAPAsyncTests: XCTestCase { // swiftlint:disable:this type_body_leng let user = try await User.ldap.unlink() XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.ldap.isLinked) } diff --git a/Tests/ParseSwiftTests/ParseLDAPCombineTests.swift b/Tests/ParseSwiftTests/ParseLDAPCombineTests.swift index fe28deb27..86c416039 100644 --- a/Tests/ParseSwiftTests/ParseLDAPCombineTests.swift +++ b/Tests/ParseSwiftTests/ParseLDAPCombineTests.swift @@ -238,7 +238,7 @@ class ParseLDAPCombineTests: XCTestCase { // swiftlint:disable:this type_body_le XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.ldap.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -287,7 +287,7 @@ class ParseLDAPCombineTests: XCTestCase { // swiftlint:disable:this type_body_le XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.ldap.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -340,7 +340,7 @@ class ParseLDAPCombineTests: XCTestCase { // swiftlint:disable:this type_body_le XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.ldap.isLinked) }) diff --git a/Tests/ParseSwiftTests/ParseLDAPTests.swift b/Tests/ParseSwiftTests/ParseLDAPTests.swift index a594ac426..33fdbbc8b 100644 --- a/Tests/ParseSwiftTests/ParseLDAPTests.swift +++ b/Tests/ParseSwiftTests/ParseLDAPTests.swift @@ -342,7 +342,7 @@ class ParseLDAPTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.ldap.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -387,7 +387,7 @@ class ParseLDAPTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.ldap.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -453,7 +453,7 @@ class ParseLDAPTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.ldap.isLinked) case .failure(let error): diff --git a/Tests/ParseSwiftTests/ParseLinkedInCombineTests.swift b/Tests/ParseSwiftTests/ParseLinkedInCombineTests.swift index 5eb909168..7dc4e0b58 100644 --- a/Tests/ParseSwiftTests/ParseLinkedInCombineTests.swift +++ b/Tests/ParseSwiftTests/ParseLinkedInCombineTests.swift @@ -243,7 +243,7 @@ class ParseLinkedInCombineTests: XCTestCase { // swiftlint:disable:this type_bod XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.linkedin.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -294,7 +294,7 @@ class ParseLinkedInCombineTests: XCTestCase { // swiftlint:disable:this type_bod XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.linkedin.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -348,7 +348,7 @@ class ParseLinkedInCombineTests: XCTestCase { // swiftlint:disable:this type_bod XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.linkedin.isLinked) }) diff --git a/Tests/ParseSwiftTests/ParseLinkedInTests.swift b/Tests/ParseSwiftTests/ParseLinkedInTests.swift index bd5d4adf3..368f5de79 100644 --- a/Tests/ParseSwiftTests/ParseLinkedInTests.swift +++ b/Tests/ParseSwiftTests/ParseLinkedInTests.swift @@ -341,7 +341,7 @@ class ParseLinkedInTests: XCTestCase { // swiftlint:disable:this type_body_lengt isMobileSDK: true) XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.linkedin.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -380,7 +380,7 @@ class ParseLinkedInTests: XCTestCase { // swiftlint:disable:this type_body_lengt let user = try await User.linkedin.link(authData: authData) XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.linkedin.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -435,7 +435,7 @@ class ParseLinkedInTests: XCTestCase { // swiftlint:disable:this type_body_lengt let user = try await User.linkedin.unlink() XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.linkedin.isLinked) } diff --git a/Tests/ParseSwiftTests/ParseTwitterAsyncTests.swift b/Tests/ParseSwiftTests/ParseTwitterAsyncTests.swift index 80dc2d1d7..56cc73916 100644 --- a/Tests/ParseSwiftTests/ParseTwitterAsyncTests.swift +++ b/Tests/ParseSwiftTests/ParseTwitterAsyncTests.swift @@ -214,7 +214,7 @@ class ParseTwitterAsyncTests: XCTestCase { // swiftlint:disable:this type_body_l authTokenSecret: "authTokenSecret") XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.twitter.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -254,7 +254,7 @@ class ParseTwitterAsyncTests: XCTestCase { // swiftlint:disable:this type_body_l let user = try await User.twitter.link(authData: twitterAuthData) XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.twitter.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -297,7 +297,7 @@ class ParseTwitterAsyncTests: XCTestCase { // swiftlint:disable:this type_body_l let user = try await User.twitter.unlink() XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.twitter.isLinked) } diff --git a/Tests/ParseSwiftTests/ParseTwitterCombineTests.swift b/Tests/ParseSwiftTests/ParseTwitterCombineTests.swift index 8d66df2d6..4f0b94a21 100644 --- a/Tests/ParseSwiftTests/ParseTwitterCombineTests.swift +++ b/Tests/ParseSwiftTests/ParseTwitterCombineTests.swift @@ -252,7 +252,7 @@ class ParseTwitterCombineTests: XCTestCase { // swiftlint:disable:this type_body XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.twitter.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -306,7 +306,7 @@ class ParseTwitterCombineTests: XCTestCase { // swiftlint:disable:this type_body XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.twitter.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -363,7 +363,7 @@ class ParseTwitterCombineTests: XCTestCase { // swiftlint:disable:this type_body XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.twitter.isLinked) }) diff --git a/Tests/ParseSwiftTests/ParseTwitterTests.swift b/Tests/ParseSwiftTests/ParseTwitterTests.swift index b2e377e03..3219c2eff 100644 --- a/Tests/ParseSwiftTests/ParseTwitterTests.swift +++ b/Tests/ParseSwiftTests/ParseTwitterTests.swift @@ -434,7 +434,7 @@ class ParseTwitterTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.twitter.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -485,7 +485,7 @@ class ParseTwitterTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertTrue(user.twitter.isLinked) XCTAssertFalse(user.anonymous.isLinked) @@ -556,7 +556,7 @@ class ParseTwitterTests: XCTestCase { case .success(let user): XCTAssertEqual(user, User.current) XCTAssertEqual(user.updatedAt, userOnServer.updatedAt) - XCTAssertEqual(user.username, "parse") + XCTAssertEqual(user.username, "hello10") XCTAssertNil(user.password) XCTAssertFalse(user.twitter.isLinked) case .failure(let error):