File not found middleware for the Website service (#4)
This PR contains the work done to add a `NotFoundMiddleware` middleware to the Website service so requests matching neither a route nor a static file return a custom 404.html page with a 404 Not Found status. Also enables index.html fallback so the landing page is served at the site root. To provider further details about the work done: * NotFoundMiddleware — intercepts the `.notFound` error from the `FileMiddleware` middleware and serves the preloaded error page with the correct content type; all other errors propagate. Falls back to a minimal body if the file is missing. * Router — wires the `NotFoundMiddleware` middleware ahead of the `FileMiddleware` and enables searchForIndexHtml. * Package — adds the **Hummingbird** product to the Library target. * Tooling — sets a custom working directory in the Xcode scheme; removes the unused `pkg-deps` target from the `Makefile` file. Reviewed-on: rock-n-code/loud-amsterdam#4 Co-authored-by: Javier Cicchelli <javier@rock-n-code.com> Co-committed-by: Javier Cicchelli <javier@rock-n-code.com>
This commit is contained in:
@@ -3,6 +3,7 @@ import Foundation
|
||||
import Hummingbird
|
||||
import HummingbirdTesting
|
||||
import Logging
|
||||
import NIOCore
|
||||
import Testing
|
||||
|
||||
@testable import Website
|
||||
@@ -21,9 +22,30 @@ struct AppTests {
|
||||
.deletingLastPathComponent() // package root
|
||||
.appendingPathComponent(.Path.staticResources)
|
||||
.path
|
||||
|
||||
|
||||
// MARK: Functional tests
|
||||
|
||||
@Test
|
||||
func `landing page to be served at root`() async throws {
|
||||
let file: StaticFile = .indexHTML
|
||||
let app = try await application(
|
||||
reader: reader(
|
||||
staticFilesPath: staticFilesPath
|
||||
)
|
||||
)
|
||||
|
||||
try await app.test(.router) { client in
|
||||
try await client.execute(
|
||||
uri: "/",
|
||||
method: .get
|
||||
) { response in
|
||||
#expect(response.status == .ok)
|
||||
#expect(response.headers[.contentType] == file.contentType)
|
||||
#expect(response.body == data(of: file))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test(arguments: StaticFile.allCases)
|
||||
func `static files to be served`(
|
||||
staticFile file: StaticFile
|
||||
@@ -45,14 +67,47 @@ struct AppTests {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
func `error page to be served when not found`() async throws {
|
||||
let file: StaticFile = .errorHTML
|
||||
let app = try await application(
|
||||
reader: reader(
|
||||
staticFilesPath: staticFilesPath
|
||||
)
|
||||
)
|
||||
|
||||
try await app.test(.router) { client in
|
||||
try await client.execute(
|
||||
uri: "/this-path-does-not-exist",
|
||||
method: .get
|
||||
) { response in
|
||||
#expect(response.status == .notFound)
|
||||
#expect(response.headers[.contentType] == file.contentType)
|
||||
#expect(response.body == data(of: file))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// MARK: - Helpers
|
||||
|
||||
private extension AppTests {
|
||||
|
||||
|
||||
// MARK: Methods
|
||||
|
||||
|
||||
func data(
|
||||
of file: StaticFile
|
||||
) -> ByteBuffer {
|
||||
let url = URL(fileURLWithPath: file.path(relativeTo: staticFilesPath))
|
||||
|
||||
guard let data = try? Data(contentsOf: url) else {
|
||||
return ByteBuffer()
|
||||
}
|
||||
|
||||
return ByteBuffer(bytes: data)
|
||||
}
|
||||
|
||||
func reader(
|
||||
staticFilesPath: String
|
||||
) -> ConfigReader {
|
||||
@@ -65,5 +120,5 @@ private extension AppTests {
|
||||
])
|
||||
])
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user