Skip to content

More sharing tests and improvements #129

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
mbrandonw merged 8 commits into from
Aug 18, 2025
Merged

More sharing tests and improvements #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3a071f
Fixing more sharing edge cases with tests.
mbrandonw Aug 16, 2025
6c4680d
wip
mbrandonw Aug 17, 2025
e721a91
wip
mbrandonw Aug 17, 2025
4f467d5
wip
mbrandonw Aug 17, 2025
44aca1c
wip
mbrandonw Aug 17, 2025
bb3f597
dont emit error when unsharing unshared record.
mbrandonw Aug 18, 2025
b23ab73
wip
mbrandonw Aug 18, 2025
b626c55
fix
stephencelis Aug 18, 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
452 changes: 243 additions & 209 deletions Sources/SharingGRDBCore/CloudKit/CloudKitSharing.swift
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Sources/SharingGRDBCore/CloudKit/SyncEngine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,8 +1006,8 @@
}
open(table)
} else if recordType == CKRecord.SystemType.share {
withErrorReporting {
for recordID in recordIDs {
for recordID in recordIDs {
withErrorReporting {
try deleteShare(recordID: recordID)
}
}
Expand Down
3 changes: 2 additions & 1 deletion Sources/SharingGRDBCore/CloudKit/Triggers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@
)
}
.where {
$0.parentRecordName.is(nil)
!SyncEngine.isSynchronizingChanges()
Copy link
Copy Markdown
Member Author

@mbrandonw mbrandonw Aug 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the bug we had. We need to check permissions only when not updating from the sync engine.

&& $0.parentRecordName.is(nil)
&& !SQLQueryExpression(
"\(raw: String.sqliteDataCloudKitSchemaName)_hasPermission(\($0.share))"
)
Expand Down
2 changes: 1 addition & 1 deletion Tests/SharingGRDBTests/CloudKitTests/AccountLifecycleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ extension BaseCloudKitTests {

try await syncEngine.processPendingDatabaseChanges(scope: .private)
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
Copy link
Copy Markdown
Member Author

@mbrandonw mbrandonw Aug 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made this change across the entire test suite so it's a little noisy. but we have direct access to container in the tests so no need to go through the sync engine.

"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down
4 changes: 2 additions & 2 deletions Tests/SharingGRDBTests/CloudKitTests/AssetsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ extension BaseCloudKitTests {

try await syncEngine.processPendingRecordZoneChanges(scope: .private)

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -82,7 +82,7 @@ extension BaseCloudKitTests {

try await syncEngine.processPendingRecordZoneChanges(scope: .private)

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down
26 changes: 13 additions & 13 deletions Tests/SharingGRDBTests/CloudKitTests/CloudKitTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ extension BaseCloudKitTests {
}
}
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -506,7 +506,7 @@ extension BaseCloudKitTests {
}
}
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -587,7 +587,7 @@ extension BaseCloudKitTests {
.execute(db)
}
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -622,7 +622,7 @@ extension BaseCloudKitTests {
}
}
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -653,7 +653,7 @@ extension BaseCloudKitTests {
.execute(db)
}
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand All @@ -677,7 +677,7 @@ extension BaseCloudKitTests {
}
}
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -728,7 +728,7 @@ extension BaseCloudKitTests {
}
)
#expect(metadata.userModificationDate == serverModificationDate)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -773,7 +773,7 @@ extension BaseCloudKitTests {
let record = try syncEngine.private.database.record(for: RemindersList.recordID(for: 1))
try await syncEngine.modifyRecords(scope: .private, saving: [record]).notify()
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -806,7 +806,7 @@ extension BaseCloudKitTests {
}
}
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -856,7 +856,7 @@ extension BaseCloudKitTests {
}
)
#expect(metadata.userModificationDate == userModificationDate)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -889,7 +889,7 @@ extension BaseCloudKitTests {
}
}
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -926,7 +926,7 @@ extension BaseCloudKitTests {
.fetchOne(db)
}
#expect(metadata == nil)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -976,7 +976,7 @@ extension BaseCloudKitTests {
}

try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down
8 changes: 4 additions & 4 deletions Tests/SharingGRDBTests/CloudKitTests/FetchRecordZoneChangesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ extension BaseCloudKitTests {

try await syncEngine.modifyRecords(scope: .private, saving: [remindersListRecord]).notify()

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -254,7 +254,7 @@ extension BaseCloudKitTests {
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
}

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -310,7 +310,7 @@ extension BaseCloudKitTests {
)
try await syncEngine.modifyRecords(scope: .private, saving: [reminderRecord]).notify()

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -375,7 +375,7 @@ extension BaseCloudKitTests {
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
}

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down
2 changes: 1 addition & 1 deletion Tests/SharingGRDBTests/CloudKitTests/FetchedDatabaseChangesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ extension BaseCloudKitTests {
try #expect(UnsyncedModel.count().fetchOne(db) == 2)
}

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down
18 changes: 9 additions & 9 deletions Tests/SharingGRDBTests/CloudKitTests/ForeignKeyConstraintTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ extension BaseCloudKitTests {
)
try await syncEngine.modifyRecords(scope: .private, saving: [reminderRecord]).notify()

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -107,7 +107,7 @@ extension BaseCloudKitTests {
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
}

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -184,7 +184,7 @@ extension BaseCloudKitTests {
)
}

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -246,7 +246,7 @@ extension BaseCloudKitTests {
)
.notify()

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -316,7 +316,7 @@ extension BaseCloudKitTests {
_ = try { try syncEngine.modifyRecords(scope: .private, saving: [remindersListRecord]) }()
try await syncEngine.modifyRecords(scope: .private, saving: [reminderRecord]).notify()

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -397,7 +397,7 @@ extension BaseCloudKitTests {
try await relaunchedSyncEngine.processPendingRecordZoneChanges(scope: .private)
}

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -474,7 +474,7 @@ extension BaseCloudKitTests {
saving: [reminderRecord, personalListRecord]
).notify()

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -526,7 +526,7 @@ extension BaseCloudKitTests {

await modifications.notify()

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -779,7 +779,7 @@ extension BaseCloudKitTests {

try await syncEngine.processPendingRecordZoneChanges(scope: .private)

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down
22 changes: 11 additions & 11 deletions Tests/SharingGRDBTests/CloudKitTests/MergeConflictTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ extension BaseCloudKitTests {
}
}
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -76,7 +76,7 @@ extension BaseCloudKitTests {
}
try await syncEngine.processPendingRecordZoneChanges(scope: .private)

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -121,7 +121,7 @@ extension BaseCloudKitTests {
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
await modificationCallback.notify()

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -172,7 +172,7 @@ extension BaseCloudKitTests {
}
}
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -230,7 +230,7 @@ extension BaseCloudKitTests {
}
try await syncEngine.processPendingRecordZoneChanges(scope: .private)

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -275,7 +275,7 @@ extension BaseCloudKitTests {
try await syncEngine.processPendingRecordZoneChanges(scope: .private)
await modificationCallback.notify()

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -344,7 +344,7 @@ extension BaseCloudKitTests {
await modificationCallback.notify()
try await syncEngine.processPendingRecordZoneChanges(scope: .private)

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -420,7 +420,7 @@ extension BaseCloudKitTests {
)
}

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -489,7 +489,7 @@ extension BaseCloudKitTests {
await modificationCallback.notify()
try await syncEngine.processPendingRecordZoneChanges(scope: .private)

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -559,7 +559,7 @@ extension BaseCloudKitTests {
await modificationCallback.notify()
try await syncEngine.processPendingRecordZoneChanges(scope: .private)

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down Expand Up @@ -636,7 +636,7 @@ extension BaseCloudKitTests {
await modificationsFinished.notify()
try await syncEngine.processPendingRecordZoneChanges(scope: .private)

assertInlineSnapshot(of: syncEngine.container, as: .customDump) {
assertInlineSnapshot(of: container, as: .customDump) {
"""
MockCloudContainer(
privateCloudDatabase: MockCloudDatabase(
Expand Down
Loading
Loading