Skip to content

Re-record snapshots #522

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
stephencelis merged 1 commit into from
Aug 11, 2026
+14 −14
Merged

Re-record snapshots #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Tests/SQLiteDataTests/CloudKitTests/AccountLifecycleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
}

@available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
@Test($accountStatus.set(.noAccount))

@stephencelis stephencelis Aug 11, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

set was deprecated, so addressing those warnings at the same time.

@mbrandonw mbrandonw Aug 11, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

yeah, and soon to need withValue: argument too...

@Test(.taskLocal($accountStatus, .noAccount))
func signInUploadsLocalRecordsToCloudKit() async throws {
try await userDatabase.userWrite { db in
try db.seed {
Expand Down Expand Up @@ -608,8 +608,8 @@

@available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
@Test(
$accountStatus.set(.noAccount),
$prepareDatabase.set { userDatabase in
.taskLocal($accountStatus, .noAccount),
.taskLocal($prepareDatabase) { userDatabase in
try await userDatabase.write { db in
try db.seed {
RemindersList(id: 1, title: "Personal")
Expand Down
2 changes: 1 addition & 1 deletion Tests/SQLiteDataTests/CloudKitTests/AttachedMetadatabaseTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

extension BaseCloudKitTests {
@MainActor
@Suite($attachMetadatabase.set(false))
@Suite(.taskLocal($attachMetadatabase, false))
final class AttachedMetadatabaseTests: BaseCloudKitTests, @unchecked Sendable {
@available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
@Test func basics() async throws {
Expand Down
4 changes: 2 additions & 2 deletions Tests/SQLiteDataTests/CloudKitTests/MetadataTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@
}

@available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
@Test($attachMetadatabase.set(true))
@Test(.taskLocal($attachMetadatabase, true))
func observation() async throws {
let remindersList = RemindersList(id: 1, title: "Personal")
try await userDatabase.userWrite { db in
Expand Down Expand Up @@ -654,7 +654,7 @@
}

@available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
@Test($attachMetadatabase.set(true))
@Test(.taskLocal($attachMetadatabase, true))
func observation_GeneratedColumn() async throws {
let remindersList = RemindersList(id: 1, title: "Personal")
try await userDatabase.userWrite { db in
Expand Down
2 changes: 1 addition & 1 deletion Tests/SQLiteDataTests/CloudKitTests/NewTableSyncTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
extension BaseCloudKitTests {
@MainActor
@Suite(
$prepareDatabase.set { userDatabase in
.taskLocal($prepareDatabase) { userDatabase in
try await userDatabase.userWrite { db in
try db.seed {
RemindersList(id: 1, title: "Personal")
Expand Down
4 changes: 2 additions & 2 deletions Tests/SQLiteDataTests/CloudKitTests/SyncEngineDelegateTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
final class SyncEngineDelegateTests: BaseCloudKitTests, @unchecked Sendable {
@available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)

@Test($syncEngineDelegate.set(MyDelegate()))
@Test(.taskLocal($syncEngineDelegate, MyDelegate()))
func accountChanged() async throws {
try await userDatabase.userWrite { db in
try db.seed {
Expand Down Expand Up @@ -175,7 +175,7 @@
try await syncEngine.processPendingDatabaseChanges(scope: .private)
}

@Test($syncEngineDelegate.set(DefaultImplementationDelegate()))
@Test(.taskLocal($syncEngineDelegate, DefaultImplementationDelegate()))
func accountChanged_DefaultImplementation() async throws {
try await userDatabase.userWrite { db in
try db.seed {
Expand Down
2 changes: 1 addition & 1 deletion Tests/SQLiteDataTests/CloudKitTests/SyncEngineLifecycleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@
// * Start sync engine
// * Verify that data is sent to CloudKit database and cached locally.
@available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
@Test($startImmediately.set(false))
@Test(.taskLocal($startImmediately, false))
func writeAndThenStart() async throws {
try await userDatabase.userWrite { db in
try db.seed {
Expand Down
4 changes: 2 additions & 2 deletions Tests/SQLiteDataTests/CloudKitTests/TriggerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,7 @@
FOR EACH ROW WHEN (("new"."zoneName") <> ("old"."zoneName")) OR (("new"."ownerName") <> ("old"."ownerName")) BEGIN
UPDATE "sqlitedata_icloud_metadata"
SET "zoneName" = "new"."zoneName", "ownerName" = "new"."ownerName", "lastKnownServerRecord" = NULL, "_lastKnownServerRecordAllFields" = NULL
WHERE (("sqlitedata_icloud_metadata"."recordName") IN ((WITH "descendantMetadatas" AS (
WHERE (("sqlitedata_icloud_metadata"."recordName") IN (WITH "descendantMetadatas" AS (
SELECT "sqlitedata_icloud_metadata"."recordName" AS "recordName", NULL AS "parentRecordName"
FROM "sqlitedata_icloud_metadata"
WHERE (("sqlitedata_icloud_metadata"."recordName") = ("new"."recordName"))
Expand All @@ -1430,7 +1430,7 @@
JOIN "descendantMetadatas" ON ("sqlitedata_icloud_metadata"."parentRecordName") = ("descendantMetadatas"."recordName")
)
SELECT "descendantMetadatas"."recordName"
FROM "descendantMetadatas")));
FROM "descendantMetadatas"));
END
"""
]
Expand Down
4 changes: 2 additions & 2 deletions Tests/SQLiteDataTests/Internal/BaseCloudKitTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import SQLiteData
import SnapshotTesting
import Testing
import TestLocals
import TestLocals
import os

@Suite(
Expand All @@ -17,7 +17,7 @@ import TestLocals
$0.continuousClock = TestClock<Duration>()
$0.dataManager = InMemoryDataManager()
},
$attachMetadatabase.set(false)
.taskLocal($attachMetadatabase, false)
)
class BaseCloudKitTests: @unchecked Sendable {
let userDatabase: UserDatabase
Expand Down