Async

Author: joshuawright11

Sources/Alchemy/Alchemy+Papyrus/Endpoint+Request.swift

@@ -49,7 +49,16 @@ extension Client {
 
         let method = HTTPMethod(rawValue: rawRequest.method)
         let fullUrl = try rawRequest.fullURL()
-        let clientResponse = try await builder.request(method, uri: fullUrl).validateSuccessful()
+        builder = builder.withBaseUrl(fullUrl).withMethod(method)
+
+        if let mockedResponse = endpoint.mockedResponse {
+            let clientRequest = builder.clientRequest
+            let clientResponse = Client.Response(request: clientRequest, host: "mock", status: .ok, version: .http1_1, headers: [:])
+            let res = mockedResponse(request)
+            return (clientResponse: clientResponse, response: res)
+        }
+
+        let clientResponse = try await builder.execute().validateSuccessful()
 
         guard Response.self != Empty.self else {
             return (clientResponse, Empty.value as! Response)

Sources/Alchemy/Client/Client.swift

@@ -117,36 +117,36 @@ public final class Client: Service {
 
     public struct Builder: RequestBuilder {
         public var client: Client
-        public var urlComponents: URLComponents { get { request.urlComponents } set { request.urlComponents = newValue} }
-        public var method: HTTPMethod { get { request.method } set { request.method = newValue} }
-        public var headers: HTTPHeaders { get { request.headers } set { request.headers = newValue} }
-        public var body: ByteContent? { get { request.body } set { request.body = newValue} }
-        private var request: Client.Request
-        
+        public var urlComponents: URLComponents { get { clientRequest.urlComponents } set { clientRequest.urlComponents = newValue} }
+        public var method: HTTPMethod { get { clientRequest.method } set { clientRequest.method = newValue} }
+        public var headers: HTTPHeaders { get { clientRequest.headers } set { clientRequest.headers = newValue} }
+        public var body: ByteContent? { get { clientRequest.body } set { clientRequest.body = newValue} }
+        public private(set) var clientRequest: Client.Request
+
         init(client: Client) {
             self.client = client
-            self.request = Request()
+            self.clientRequest = Request()
         }
 
         public func execute() async throws -> Client.Response {
-            try await client.execute(req: request)
+            try await client.execute(req: clientRequest)
         }
 
         /// Sets an `HTTPClient.Configuration` for this request only. See the
         /// `swift-server/async-http-client` package for configuration
         /// options.
         public func withClientConfig(_ config: HTTPClient.Configuration) -> Builder {
-            with { $0.request.config = config }
+            with { $0.clientRequest.config = config }
         }
 
         /// Timeout if the request doesn't finish in the given time amount.
         public func withTimeout(_ timeout: TimeAmount) -> Builder {
-            with { $0.request.timeout = timeout }
+            with { $0.clientRequest.timeout = timeout }
         }
 
         /// Allow the response to be streamed.
         public func withStream() -> Builder {
-            with { $0.request.streamResponse = true }
+            with { $0.clientRequest.streamResponse = true }
         }
 
         /// Stub this builder's client, causing it to respond to all incoming

Tests/Alchemy/Auth/BasicAuthableTests.swift

@@ -2,7 +2,7 @@ import AlchemyTest
 
 final class BasicAuthableTests: TestCase<TestApp> {
     func testBasicAuthable() async throws {
-        Database.fake(migrations: [AuthModel.Migrate()])
+        try await Database.fake(migrations: [AuthModel.Migrate()])
 
         app.use(AuthModel.basicAuthMiddleware())
         app.get("/user") { try $0.get(AuthModel.self) }

Tests/Alchemy/Auth/TokenAuthableTests.swift

@@ -2,7 +2,7 @@ import AlchemyTest
 
 final class TokenAuthableTests: TestCase<TestApp> {
     func testTokenAuthable() async throws {
-        Database.fake(migrations: [AuthModel.Migrate(), TokenModel.Migrate()])
+        try await Database.fake(migrations: [AuthModel.Migrate(), TokenModel.Migrate()])
 
         app.use(TokenModel.tokenAuthMiddleware())
         app.get("/user") { req -> UUID in

Tests/Alchemy/Cache/CacheTests.swift

@@ -29,7 +29,7 @@ final class CacheTests: TestCase<TestApp> {
 
     func testDatabaseCache() async throws {
         for test in allTests {
-            Database.fake(migrations: [Cache.AddCacheMigration()])
+            try await Database.fake(migrations: [Cache.AddCacheMigration()])
             Cache.bind(.database)
             try await test()
         }

Tests/Alchemy/Commands/Migrate/RunMigrateTests.swift

@@ -4,7 +4,7 @@ import AlchemyTest
 
 final class RunMigrateTests: TestCase<TestApp> {
     func testRun() async throws {
-        let db = Database.fake()
+        let db = try await Database.fake()
         db.migrations = [MigrationA()]
         XCTAssertFalse(MigrationA.didUp)
         XCTAssertFalse(MigrationA.didDown)

Tests/Alchemy/Commands/Seed/SeedDatabaseTests.swift

@@ -4,7 +4,7 @@ import AlchemyTest
 
 final class SeedDatabaseTests: TestCase<TestApp> {
     func testSeed() async throws {
-        let db = Database.fake(migrations: [SeedModel.Migrate()])
+        let db = try await Database.fake(migrations: [SeedModel.Migrate()])
         db.seeders = [Seeder1(), Seeder2()]
         try SeedDatabase(database: nil).run()
         try app.lifecycle.startAndWait()
@@ -13,7 +13,7 @@ final class SeedDatabaseTests: TestCase<TestApp> {
     }
 
     func testNamedSeed() async throws {
-        let db = Database.fake("a", migrations: [SeedModel.Migrate()])
+        let db = try await Database.fake("a", migrations: [SeedModel.Migrate()])
         db.seeders = [Seeder3(), Seeder4()]
 
         try app.start("db:seed", "seeder3", "--database", "a")

Tests/Alchemy/Commands/Serve/RunServeTests.swift

@@ -3,9 +3,9 @@ import Alchemy
 import AlchemyTest
 
 final class RunServeTests: TestCase<TestApp> {
-    override func setUp() {
-        super.setUp()
-        Database.fake()
+    override func setUp() async throws {
+        try await super.setUp()
+        try await Database.fake()
         Queue.fake()
     }
 

Tests/Alchemy/Queue/QueueTests.swift

@@ -44,7 +44,7 @@ final class QueueTests: TestCase<TestApp> {
     func testDatabaseQueue() async throws {
         do {
             for test in allTests {
-                Database.fake(migrations: [Queue.AddJobsMigration()])
+                try await Database.fake(migrations: [Queue.AddJobsMigration()])
                 Queue.bind(.database)
                 try await test(#filePath, #line)
             }

Tests/Alchemy/SQL/Database/Seeding/DatabaseSeederTests.swift

@@ -4,7 +4,7 @@ import AlchemyTest
 
 final class DatabaseSeederTests: TestCase<TestApp> {
     func testSeeder() async throws {
-        Database.fake(
+        try await Database.fake(
             migrations: [
                 SeedModel.Migrate(),
                 OtherSeedModel.Migrate()],
@@ -18,7 +18,7 @@ final class DatabaseSeederTests: TestCase<TestApp> {
     }
 
     func testSeedWithNames() async throws {
-        Database.fake(
+        try await Database.fake(
             migrations: [
                 SeedModel.Migrate(),
                 OtherSeedModel.Migrate()])