Skip to content

Commit

Permalink
Fixed unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
samdeane committed Apr 27, 2021
1 parent 55f8928 commit 3e4deff
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Sources/LilliputWeb/Pages/Support/LeafPage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ struct Site: Codable {
}

struct RenderContext<Page>: Codable where Page: LeafPage {
internal init(page: Page, user: User?, error: String?) {
internal init(page: Page, user: User?, error: String?, game: GameConfiguration) {
let file = String(describing: Page.self)

self.site = Site(title: "Strange Cases")
self.site = Site(title: game.name)
self.meta = page.meta(for: user)
self.file = file
self.page = page
Expand All @@ -37,7 +37,7 @@ struct RenderContext<Page>: Codable where Page: LeafPage {

extension Request {
func render<T>(_ page: T, user: User? = nil, error: Error? = nil) -> EventLoopFuture<Response> where T: LeafPage {
let context = RenderContext(page: page, user: user, error: error?.localizedDescription)
let context = RenderContext(page: page, user: user, error: error?.localizedDescription, game: application.game)
return view.render(context.file, context).encodeResponse(for: self)
}
}
10 changes: 7 additions & 3 deletions Tests/AppTests/AppTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ final class AppTests: XCTestCase {
func testHelloWorld() throws {
let app = Application(.testing)
defer { app.shutdown() }
try configure(app, game: GameConfiguration(name: "", url: LilliputExamples.urlForGame(named: "ChairTest")!))

let name = "ChairTest"
let url = LilliputExamples.urlForGame(named: name)!
let game = GameConfiguration(name: name, url: url)
try configure(app, game: game)

try app.test(.GET, "hello") { res in
try app.test(.GET, "/") { res in
XCTAssertEqual(res.status, .ok)
XCTAssertEqual(res.body.string, "Hello, world!")
XCTAssertTrue(res.body.string.contains(game.name))
}
}
}

0 comments on commit 3e4deff

Please sign in to comment.