Skip to content

Fix crashes in Xcode 15 #3359

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
merged 2 commits into from
Sep 3, 2024
Merged

Fix crashes in Xcode 15 #3359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88b5fbb
Fix crashes in Xcode 15
finestructure Sep 3, 2024
5ff0946
Fix Swift 6 warning
finestructure Sep 3, 2024
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
3 changes: 2 additions & 1 deletion Tests/AppTests/PackageCollectionControllerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,11 @@ class PackageCollectionControllerTests: AppTestCase {
summary: "summary 1").create(on: app.db)

// MUT
let encoder = self.encoder
try await app.test(
.GET,
"foo/collection.json",
afterResponse: { res async throws in
afterResponse: { @MainActor res async throws in
// validation
XCTAssertEqual(res.status, .ok)
let json = try res.content.decode(PackageCollection.self)
Copy link
Member Author

Choose a reason for hiding this comment

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

The snapshot test here (and the others below) still fail due to the ordering issue. We could skip them for compiler(<6) but it's safer to just let it be for now. If it becomes a problem in day-to-day running we can revisit that.

Expand Down
20 changes: 18 additions & 2 deletions Tests/AppTests/PackageCollectionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,13 @@ class PackageCollectionTests: AppTestCase {
keywords: ["key", "word"],
overview: "overview")

// validate
#if compiler(<6)
await MainActor.run { // validate
assertSnapshot(of: res, as: .json(encoder))
}
#else
assertSnapshot(of: res, as: .json(encoder))
#endif
}

func test_generate_from_urls_noResults() async throws {
Expand Down Expand Up @@ -467,8 +472,13 @@ class PackageCollectionTests: AppTestCase {
authorName: "Foo",
keywords: ["key", "word"])

// validate
#if compiler(<6)
await MainActor.run { // validate
assertSnapshot(of: res, as: .json(encoder))
}
#else
assertSnapshot(of: res, as: .json(encoder))
#endif
}

func test_generate_for_owner_noResults() async throws {
Expand Down Expand Up @@ -768,7 +778,13 @@ class PackageCollectionTests: AppTestCase {

// validate signed collection content
XCTAssertFalse(signedCollection.signature.signature.isEmpty)
#if compiler(<6)
await MainActor.run {
assertSnapshot(of: signedCollection, as: .json(encoder))
}
#else
assertSnapshot(of: signedCollection, as: .json(encoder))
#endif

// validate signature
let validated = try await SignedCollection.validate(signedCollection: signedCollection)
Expand Down
Loading