Update sessions to swift 6

Author: adam-fowler

sessions/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 import PackageDescription
 
 let package = Package(
@@ -10,9 +10,9 @@ let package = Package(
         .executable(name: "App", targets: ["App"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.19.0"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-auth.git", from: "2.0.0"),
-        .package(url: "https://github.com/hummingbird-project/hummingbird-fluent.git", from: "2.0.0-beta.2"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird-fluent.git", from: "2.0.0"),
         .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.48.5"),
         .package(url: "https://github.com/vapor/fluent-sqlite-driver.git", from: "4.7.0"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),

sessions/Tests/AppTests/AppTests.swift

@@ -1,15 +1,17 @@
-@testable import App
+import Foundation
 import Hummingbird
 import HummingbirdAuthTesting
 import HummingbirdTesting
-import XCTest
+import Testing
+
+@testable import App
 
 struct TestArguments: AppArguments {
     var migrate: Bool = true
     var inMemoryDatabase: Bool = true
 }
 
-final class AppTests: XCTestCase {
+struct AppTests {
     func createUser<Return>(
         name: String,
         password: String,
@@ -32,7 +34,7 @@ final class AppTests: XCTestCase {
         client: some TestClientProtocol,
         _ callback: @escaping (TestResponse) throws -> Return
     ) async throws -> Return {
-        return try await client.execute(
+        try await client.execute(
             uri: "/user/login",
             method: .post,
             auth: .basic(username: name, password: password)
@@ -46,7 +48,7 @@ final class AppTests: XCTestCase {
         client: some TestClientProtocol,
         _ callback: @escaping (TestResponse) throws -> Return
     ) async throws -> Return {
-        return try await client.execute(
+        try await client.execute(
             uri: "/user",
             method: .get,
             headers: cookie.map { [.cookie: $0] } ?? [:]
@@ -55,48 +57,47 @@ final class AppTests: XCTestCase {
         }
     }
 
-    func testCreateUser() async throws {
+    @Test func testCreateUser() async throws {
         let app = try await buildApplication(TestArguments(), configuration: .init())
         try await app.test(.live) { client in
             try await self.createUser(name: "adam", password: "test", client: client) { response in
-                XCTAssertEqual(response.status, .ok)
+                #expect(response.status == .ok)
             }
             try await self.createUser(name: "adam", password: "test", client: client) { response in
-                XCTAssertEqual(response.status, .conflict)
+                #expect(response.status == .conflict)
             }
         }
     }
 
-    func testLogin() async throws {
+    @Test func testLogin() async throws {
         let app = try await buildApplication(TestArguments(), configuration: .init())
         try await app.test(.live) { client in
             try await self.createUser(name: "adam", password: "testLogin", client: client) { response in
-                XCTAssertEqual(response.status, .ok)
+                #expect(response.status == .ok)
             }
             try await self.login(name: "adam", password: "testLogin", client: client) { response in
-                XCTAssertEqual(response.status, .ok)
+                #expect(response.status == .ok)
             }
         }
     }
 
-    func testSession() async throws {
+    @Test func testSession() async throws {
         let app = try await buildApplication(TestArguments(), configuration: .init())
         try await app.test(.live) { client in
             try await self.createUser(name: "john", password: "testSession", client: client) { response in
-                XCTAssertEqual(response.status, .ok)
+                #expect(response.status == .ok)
             }
             let cookie = try await self.login(name: "john", password: "testSession", client: client) { response in
-                XCTAssertEqual(response.status, .ok)
-                return try XCTUnwrap(response.headers[.setCookie])
+                #expect(response.status == .ok)
+                return try #require(response.headers[.setCookie])
             }
             try await self.getCurrent(cookie: cookie, client: client) { response in
-                XCTAssertEqual(response.status, .ok)
-                let body = try XCTUnwrap(response.body)
-                let user = try JSONDecoder().decode(UserResponse.self, from: body)
-                XCTAssertEqual(user.name, "john")
+                #expect(response.status == .ok)
+                let user = try JSONDecoder().decode(UserResponse.self, from: response.body)
+                #expect(user.name == "john")
             }
             try await self.getCurrent(cookie: nil, client: client) { response in
-                XCTAssertEqual(response.status, .unauthorized)
+                #expect(response.status == .unauthorized)
             }
         }
     }