javier
a621ada0bf
This PR contains the work done to replace the use of static _HTML_ files with type-safe HTML rendered server-side via **Elementary** through **Hummingbird**. To provide further details about the work done: * Added the **Elementary** dependencies. * Added the `IndexPage` and `ErrorPage` pages, ported from the old HTML boilerplate; removed the static files. * Added the `RootController` controller serving GET / using the `IndexPage` page, wired into the router. * Reworked the `NotFoundMiddleware` middleare to render `ErrorPage` page directly; non-notFound errors still propagate. * the `FileMiddleware` middleware no longer searches for any static `index.html` file. * Simplified the `StaticFile` enumeration, dropped unused constants and now-unnecessary throws. Reviewed-on: rock-n-code/loud-amsterdam#5 Co-authored-by: Javier Cicchelli <javier@rock-n-code.com> Co-committed-by: Javier Cicchelli <javier@rock-n-code.com>
109 lines
2.9 KiB
Swift
109 lines
2.9 KiB
Swift
import Configuration
|
|
import Foundation
|
|
import Hummingbird
|
|
import HummingbirdTesting
|
|
import Logging
|
|
import NIOCore
|
|
import Testing
|
|
|
|
@testable import Website
|
|
@testable import WebsiteCore
|
|
|
|
@Suite("App executable")
|
|
struct AppTests {
|
|
|
|
// MARK: Constants
|
|
|
|
// Absolute path to the package's "Resources/Static" folder, derived from this
|
|
// file's location so the static files resolve regardless of the working directory.
|
|
private let staticFilesPath = URL(fileURLWithPath: #filePath)
|
|
.deletingLastPathComponent() // Tests/App
|
|
.deletingLastPathComponent() // Tests
|
|
.deletingLastPathComponent() // package root
|
|
.appendingPathComponent(.Path.staticResources)
|
|
.path
|
|
|
|
// MARK: Functional tests
|
|
|
|
@Test
|
|
func `landing page to be served at root`() async throws {
|
|
try await app.test(.router) { client in
|
|
try await client.execute(
|
|
uri: "/",
|
|
method: .get
|
|
) { response in
|
|
let body = String(buffer: response.body)
|
|
|
|
#expect(response.status == .ok)
|
|
#expect(response.headers[.contentType]?.hasPrefix("text/html") == true)
|
|
#expect(body.contains("Hello world!"))
|
|
}
|
|
}
|
|
}
|
|
|
|
@Test(arguments: StaticFile.allCases)
|
|
func `static files to be served`(
|
|
staticFile file: StaticFile
|
|
) async throws {
|
|
try await app.test(.router) { client in
|
|
try await client.execute(
|
|
uri: "/\(file.relativePath)",
|
|
method: .get
|
|
) { response in
|
|
#expect(response.status == .ok)
|
|
#expect(response.headers[.contentType] == file.contentType)
|
|
}
|
|
}
|
|
}
|
|
|
|
@Test
|
|
func `error page to be served when not found`() async throws {
|
|
try await app.test(.router) { client in
|
|
try await client.execute(
|
|
uri: "/this-path-does-not-exist",
|
|
method: .get
|
|
) { response in
|
|
let body = String(buffer: response.body)
|
|
|
|
#expect(response.status == .notFound)
|
|
#expect(response.headers[.contentType]?.hasPrefix("text/html") == true)
|
|
#expect(body.contains("Page Not Found"))
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
// MARK: - Helpers
|
|
|
|
private extension AppTests {
|
|
|
|
// MARK: Computed
|
|
|
|
var app: some ApplicationProtocol {
|
|
get async {
|
|
await application(
|
|
reader: reader(
|
|
staticFilesPath: staticFilesPath
|
|
)
|
|
)
|
|
}
|
|
}
|
|
|
|
// MARK: Methods
|
|
|
|
func reader(
|
|
staticFilesPath: String
|
|
) -> ConfigReader {
|
|
ConfigReader(providers: [
|
|
InMemoryProvider(values: [
|
|
.HTTP.host: "127.0.0.1",
|
|
.HTTP.port: "0",
|
|
.Log.level: "trace",
|
|
.Path.staticFiles: .init(stringLiteral: staticFilesPath),
|
|
])
|
|
])
|
|
}
|
|
|
|
}
|