From 43795825664db680c38135824de4cc4b908d3f7b Mon Sep 17 00:00:00 2001 From: Joannis Orlandos Date: Fri, 22 Mar 2024 15:04:57 +0100 Subject: [PATCH] Update the HB 2 template --- Package.swift | 4 ++-- Sources/App/Application+build.swift | 6 +++--- Tests/AppTests/AppTests.swift | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Package.swift b/Package.swift index 890a0c0..a0c0b62 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let package = Package( .executable(name: "App", targets: ["App"]), ], dependencies: [ - .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-alpha.1"), + .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.1"), .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.3.0") ], targets: [ @@ -29,7 +29,7 @@ let package = Package( .testTarget(name: "AppTests", dependencies: [ .byName(name: "App"), - .product(name: "HummingbirdXCT", package: "hummingbird") + .product(name: "HummingbirdTesting", package: "hummingbird") ] ) ] diff --git a/Sources/App/Application+build.swift b/Sources/App/Application+build.swift index 83c0eaa..22e495a 100644 --- a/Sources/App/Application+build.swift +++ b/Sources/App/Application+build.swift @@ -9,12 +9,12 @@ public protocol AppArguments { var port: Int { get } } -public func buildApplication(_ arguments: some AppArguments) -> some HBApplicationProtocol { - let router = HBRouter() +public func buildApplication(_ arguments: some AppArguments) -> some ApplicationProtocol { + let router = Router() router.get("/health") { _,_ -> HTTPResponse.Status in return .ok } - let app = HBApplication( + let app = Application( router: router, configuration: .init( address: .hostname(arguments.hostname, port: arguments.port), diff --git a/Tests/AppTests/AppTests.swift b/Tests/AppTests/AppTests.swift index 961dd88..be95529 100644 --- a/Tests/AppTests/AppTests.swift +++ b/Tests/AppTests/AppTests.swift @@ -1,6 +1,6 @@ @testable import App import Hummingbird -import HummingbirdXCT +import HummingbirdTesting import XCTest final class AppTests: XCTestCase { @@ -13,7 +13,7 @@ final class AppTests: XCTestCase { let args = TestArguments() let app = buildApplication(args) try await app.test(.router) { client in - try await client.XCTExecute(uri: "/health", method: .get) { response in + try await client.execute(uri: "/health", method: .get) { response in XCTAssertEqual(response.status, .ok) } }