Moved test database teardown into defer blocks and unified the one-decimal formatting in the Website service.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Services/Website/Tests/Library/Cases/Internal/Pages/SellingPagesTests.swift

@@ -18,7 +18,7 @@ struct SellingPagesTests {
         let html = GradingGuidePage().render()
 
         for step in Grading.scale {
-            #expect(html.contains("<strong>\(step.grade.gradeLabel)</strong><span>\(step.code)</span>"))
+            #expect(html.contains("<strong>\(step.grade.oneDecimal)</strong><span>\(step.code)</span>"))
         }
 
         for defect in Grading.Defect.allCases {

Services/Website/Tests/Library/Cases/Public/Controllers/AccountAndCollectingControllerTests.swift

@@ -256,30 +256,26 @@ private extension AccountAndCollectingControllerTests {
             logger: Logger(label: "test")
         )()
 
-        do {
-            await PrepareDB()(for: fluent)
-
-            try await fluent.migrate()
-
-            let accounts = AccountRepository(fluent: fluent)
-            let catalogue = CatalogueRepository(fluent: fluent)
-            let collecting = CollectingRepository(fluent: fluent, now: now)
-            let sessions = SessionStore(trade: .init(fluent: fluent), collecting: collecting)
-            let router = Router(context: WebsiteRequestContext.self)
-
-            router.addRoutes(CatalogueController<WebsiteRequestContext>(repository: catalogue, sessions: sessions, collecting: collecting).routes)
-            router.addRoutes(SessionController<WebsiteRequestContext>(sessions: sessions, accounts: accounts, catalogue: catalogue).routes)
-            router.addRoutes(AccountController<WebsiteRequestContext>(accounts: accounts, catalogue: catalogue, sessions: sessions).routes)
-            router.addRoutes(CollectingController<WebsiteRequestContext>(collecting: collecting, catalogue: catalogue, sessions: sessions).routes)
-
-            try await Application(router: router).test(.router, body)
-        } catch {
+        defer {
             try? await fluent.shutdown()
-
-            throw error
         }
 
-        try await fluent.shutdown()
+        await PrepareDB()(for: fluent)
+
+        try await fluent.migrate()
+
+        let accounts = AccountRepository(fluent: fluent)
+        let catalogue = CatalogueRepository(fluent: fluent)
+        let collecting = CollectingRepository(fluent: fluent, now: now)
+        let sessions = SessionStore(trade: .init(fluent: fluent), collecting: collecting)
+        let router = Router(context: WebsiteRequestContext.self)
+
+        router.addRoutes(CatalogueController<WebsiteRequestContext>(repository: catalogue, sessions: sessions, collecting: collecting).routes)
+        router.addRoutes(SessionController<WebsiteRequestContext>(sessions: sessions, accounts: accounts, catalogue: catalogue).routes)
+        router.addRoutes(AccountController<WebsiteRequestContext>(accounts: accounts, catalogue: catalogue, sessions: sessions).routes)
+        router.addRoutes(CollectingController<WebsiteRequestContext>(collecting: collecting, catalogue: catalogue, sessions: sessions).routes)
+
+        try await Application(router: router).test(.router, body)
     }
 
 }

Services/Website/Tests/Library/Cases/Public/Controllers/CatalogueControllerTests.swift

@@ -110,23 +110,19 @@ private extension CatalogueControllerTests {
             logger: Logger(label: "test")
         )()
 
-        do {
-            await PrepareDB()(for: fluent)
-
-            try await fluent.migrate()
-
-            let router = Router(context: WebsiteRequestContext.self)
-
-            router.addRoutes(CatalogueController<WebsiteRequestContext>(repository: .init(fluent: fluent)).routes)
-
-            try await Application(router: router).test(.router, body)
-        } catch {
+        defer {
             try? await fluent.shutdown()
-
-            throw error
         }
 
-        try await fluent.shutdown()
+        await PrepareDB()(for: fluent)
+
+        try await fluent.migrate()
+
+        let router = Router(context: WebsiteRequestContext.self)
+
+        router.addRoutes(CatalogueController<WebsiteRequestContext>(repository: .init(fluent: fluent)).routes)
+
+        try await Application(router: router).test(.router, body)
     }
 
 }

Services/Website/Tests/Library/Cases/Public/Controllers/ListingFormControllerTests.swift

@@ -204,35 +204,31 @@ private extension ListingFormControllerTests {
                 logger: Logger(label: "test")
             )()
 
-            do {
-                await PrepareDB()(for: fluent)
-
-                try await fluent.migrate()
-
-                let catalogue = CatalogueRepository(fluent: fluent)
-                let trade = TradeRepository(fluent: fluent)
-                let sessions = SessionStore(trade: trade)
-                let router = Router(context: WebsiteRequestContext.self)
-
-                router.addRoutes(CatalogueController<WebsiteRequestContext>(repository: catalogue, sessions: sessions).routes)
-                router.addRoutes(SessionController<WebsiteRequestContext>(sessions: sessions, accounts: .init(fluent: fluent), catalogue: catalogue).routes)
-                router.addRoutes(ListingFormController<WebsiteRequestContext>(
-                    catalogue: catalogue,
-                    trade: trade,
-                    sessions: sessions,
-                    photos: .init(staticFilesPath: folder)
-                ).routes)
-
-                try await Application(router: router).test(.router) { client in
-                    try await body(client, folder)
-                }
-            } catch {
+            defer {
                 try? await fluent.shutdown()
-
-                throw error
             }
 
-            try await fluent.shutdown()
+            await PrepareDB()(for: fluent)
+
+            try await fluent.migrate()
+
+            let catalogue = CatalogueRepository(fluent: fluent)
+            let trade = TradeRepository(fluent: fluent)
+            let sessions = SessionStore(trade: trade)
+            let router = Router(context: WebsiteRequestContext.self)
+
+            router.addRoutes(CatalogueController<WebsiteRequestContext>(repository: catalogue, sessions: sessions).routes)
+            router.addRoutes(SessionController<WebsiteRequestContext>(sessions: sessions, accounts: .init(fluent: fluent), catalogue: catalogue).routes)
+            router.addRoutes(ListingFormController<WebsiteRequestContext>(
+                catalogue: catalogue,
+                trade: trade,
+                sessions: sessions,
+                photos: .init(staticFilesPath: folder)
+            ).routes)
+
+            try await Application(router: router).test(.router) { client in
+                try await body(client, folder)
+            }
         }
     }
 

Services/Website/Tests/Library/Cases/Public/Controllers/PasskeyControllerTests.swift

@@ -156,27 +156,23 @@ private extension PasskeyControllerTests {
             logger: Logger(label: "test")
         )()
 
-        do {
-            await PrepareDB()(for: fluent)
-
-            try await fluent.migrate()
-
-            let router = Router(context: WebsiteRequestContext.self)
-
-            router.addRoutes(PasskeyController<WebsiteRequestContext>(
-                origin: "http://localhost:8080",
-                accounts: .init(fluent: fluent),
-                sessions: .init()
-            ).routes)
-
-            try await Application(router: router).test(.router, body)
-        } catch {
+        defer {
             try? await fluent.shutdown()
-
-            throw error
         }
 
-        try await fluent.shutdown()
+        await PrepareDB()(for: fluent)
+
+        try await fluent.migrate()
+
+        let router = Router(context: WebsiteRequestContext.self)
+
+        router.addRoutes(PasskeyController<WebsiteRequestContext>(
+            origin: "http://localhost:8080",
+            accounts: .init(fluent: fluent),
+            sessions: .init()
+        ).routes)
+
+        try await Application(router: router).test(.router, body)
     }
 
 }

Services/Website/Tests/Library/Cases/Public/Controllers/SessionControllerTests.swift

@@ -203,31 +203,27 @@ private extension SessionControllerTests {
             logger: Logger(label: "test")
         )()
 
-        do {
-            await PrepareDB()(for: fluent)
-
-            try await fluent.migrate()
-
-            let catalogue = CatalogueRepository(fluent: fluent)
-            let router = Router(context: WebsiteRequestContext.self)
-            let sessions = SessionStore()
-
-            router.addRoutes(RootController<WebsiteRequestContext>(sessions: sessions).routes)
-            router.addRoutes(CatalogueController<WebsiteRequestContext>(repository: catalogue, sessions: sessions).routes)
-            router.addRoutes(SessionController<WebsiteRequestContext>(
-                sessions: sessions,
-                accounts: .init(fluent: fluent),
-                catalogue: catalogue
-            ).routes)
-
-            try await Application(router: router).test(.router, body)
-        } catch {
+        defer {
             try? await fluent.shutdown()
-
-            throw error
         }
 
-        try await fluent.shutdown()
+        await PrepareDB()(for: fluent)
+
+        try await fluent.migrate()
+
+        let catalogue = CatalogueRepository(fluent: fluent)
+        let router = Router(context: WebsiteRequestContext.self)
+        let sessions = SessionStore()
+
+        router.addRoutes(RootController<WebsiteRequestContext>(sessions: sessions).routes)
+        router.addRoutes(CatalogueController<WebsiteRequestContext>(repository: catalogue, sessions: sessions).routes)
+        router.addRoutes(SessionController<WebsiteRequestContext>(
+            sessions: sessions,
+            accounts: .init(fluent: fluent),
+            catalogue: catalogue
+        ).routes)
+
+        try await Application(router: router).test(.router, body)
     }
 
 }

Services/Website/Tests/Library/Cases/Public/Controllers/TradeControllerTests.swift

@@ -320,28 +320,24 @@ private extension TradeControllerTests {
             logger: Logger(label: "test")
         )()
 
-        do {
-            await PrepareDB()(for: fluent)
-
-            try await fluent.migrate()
-
-            let catalogue = CatalogueRepository(fluent: fluent)
-            let trade = TradeRepository(fluent: fluent)
-            let sessions = SessionStore(trade: trade)
-            let router = Router(context: WebsiteRequestContext.self)
-
-            router.addRoutes(CatalogueController<WebsiteRequestContext>(repository: catalogue, sessions: sessions).routes)
-            router.addRoutes(SessionController<WebsiteRequestContext>(sessions: sessions, accounts: .init(fluent: fluent), catalogue: catalogue).routes)
-            router.addRoutes(TradeController<WebsiteRequestContext>(trade: trade, catalogue: catalogue, sessions: sessions).routes)
-
-            try await Application(router: router).test(.router, body)
-        } catch {
+        defer {
             try? await fluent.shutdown()
-
-            throw error
         }
 
-        try await fluent.shutdown()
+        await PrepareDB()(for: fluent)
+
+        try await fluent.migrate()
+
+        let catalogue = CatalogueRepository(fluent: fluent)
+        let trade = TradeRepository(fluent: fluent)
+        let sessions = SessionStore(trade: trade)
+        let router = Router(context: WebsiteRequestContext.self)
+
+        router.addRoutes(CatalogueController<WebsiteRequestContext>(repository: catalogue, sessions: sessions).routes)
+        router.addRoutes(SessionController<WebsiteRequestContext>(sessions: sessions, accounts: .init(fluent: fluent), catalogue: catalogue).routes)
+        router.addRoutes(TradeController<WebsiteRequestContext>(trade: trade, catalogue: catalogue, sessions: sessions).routes)
+
+        try await Application(router: router).test(.router, body)
     }
 
 }