Merge pull request #3359 from SwiftPackageIndex/fix-xcode-15-test-crashes

Fix crashes in Xcode 15

Author: finestructure

Tests/AppTests/PackageCollectionControllerTests.swift

@@ -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)

Tests/AppTests/PackageCollectionTests.swift

@@ -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 {
@@ -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 {
@@ -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)