-
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23 from dannflor/customErrors
Add custom mapping from errors to views
- Loading branch information
Showing
5 changed files
with
344 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
155 changes: 155 additions & 0 deletions
155
Tests/LeafErrorMiddlewareTests/CustomMappingCustomGeneratorTests.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| import LeafErrorMiddleware | ||
| @testable import Logging | ||
| import Vapor | ||
| import XCTest | ||
|
|
||
| class CustomMappingCustomGeneratorTests: XCTestCase { | ||
| // MARK: - Properties | ||
|
|
||
| var app: Application! | ||
| var viewRenderer: ThrowingViewRenderer! | ||
| var logger = CapturingLogger() | ||
| var eventLoopGroup: EventLoopGroup! | ||
|
|
||
| // MARK: - Overrides | ||
|
|
||
| override func setUpWithError() throws { | ||
| eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) | ||
| viewRenderer = ThrowingViewRenderer(eventLoop: eventLoopGroup.next()) | ||
| LoggingSystem.bootstrapInternal { _ in | ||
| self.logger | ||
| } | ||
| app = Application(.testing, .shared(eventLoopGroup)) | ||
|
|
||
| app.views.use { _ in | ||
| self.viewRenderer | ||
| } | ||
|
|
||
| func routes(_ router: RoutesBuilder) throws { | ||
| router.get("ok") { _ in | ||
| "ok" | ||
| } | ||
|
|
||
| router.get("404") { _ -> HTTPStatus in | ||
| .notFound | ||
| } | ||
|
|
||
| router.get("403") { _ -> Response in | ||
| throw Abort(.forbidden) | ||
| } | ||
|
|
||
| router.get("serverError") { _ -> Response in | ||
| throw Abort(.internalServerError) | ||
| } | ||
|
|
||
| router.get("unknownError") { _ -> Response in | ||
| throw TestError() | ||
| } | ||
|
|
||
| router.get("unauthorized") { _ -> Response in | ||
| throw Abort(.unauthorized) | ||
| } | ||
|
|
||
| router.get("303") { _ -> Response in | ||
| throw Abort.redirect(to: "ok") | ||
| } | ||
|
|
||
| router.get("404withReason") { _ -> HTTPStatus in | ||
| throw Abort(.notFound, reason: "Could not find it") | ||
| } | ||
|
|
||
| router.get("500withReason") { _ -> HTTPStatus in | ||
| throw Abort(.badGateway, reason: "I messed up") | ||
| } | ||
| } | ||
|
|
||
| try routes(app) | ||
| let mappings: [HTTPStatus: String] = [ | ||
| .notFound: "404", | ||
| .unauthorized: "401", | ||
| .forbidden: "403", | ||
| // Verify that non-error mappings are ignored | ||
| .seeOther: "303" | ||
| ] | ||
| let leafMiddleware = LeafErrorMiddleware(errorMappings: mappings) { status, error, req async throws -> AContext in | ||
| AContext(trigger: true) | ||
| } | ||
| app.middleware.use(leafMiddleware) | ||
| } | ||
|
|
||
| override func tearDownWithError() throws { | ||
| app.shutdown() | ||
| try eventLoopGroup.syncShutdownGracefully() | ||
| } | ||
|
|
||
| // MARK: - Tests | ||
|
|
||
| func testThatValidEndpointWorks() throws { | ||
| let response = try app.getResponse(to: "/ok") | ||
| XCTAssertEqual(response.status, .ok) | ||
| } | ||
|
|
||
| func testThatRedirectIsNotCaught() throws { | ||
| let response = try app.getResponse(to: "/303") | ||
| XCTAssertEqual(response.status, .seeOther) | ||
| XCTAssertEqual(response.headers[.location].first, "ok") | ||
| XCTAssertNotEqual(viewRenderer.leafPath, "303") | ||
| } | ||
|
|
||
| func testNonAbort404IsCaughtCorrectly() throws { | ||
| let response = try app.getResponse(to: "/404") | ||
| XCTAssertEqual(response.status, .notFound) | ||
| XCTAssertEqual(viewRenderer.leafPath, "404") | ||
| } | ||
|
|
||
| func testThat403IsCaughtCorrectly() throws { | ||
| let response = try app.getResponse(to: "/403") | ||
| XCTAssertEqual(response.status, .forbidden) | ||
| XCTAssertEqual(viewRenderer.leafPath, "403") | ||
| let context = try XCTUnwrap(viewRenderer.capturedContext as? AContext) | ||
| XCTAssertTrue(context.trigger) | ||
| } | ||
|
|
||
| func testContextGeneratedOn401Page() throws { | ||
| let response = try app.getResponse(to: "/unauthorized") | ||
| XCTAssertEqual(response.status, .unauthorized) | ||
| XCTAssertEqual(viewRenderer.leafPath, "401") | ||
| let context = try XCTUnwrap(viewRenderer.capturedContext as? AContext) | ||
| XCTAssertTrue(context.trigger) | ||
| } | ||
| func testContextGeneratedOn500Page() throws { | ||
| let response = try app.getResponse(to: "/serverError") | ||
| XCTAssertEqual(response.status, .internalServerError) | ||
| XCTAssertEqual(viewRenderer.leafPath, "serverError") | ||
| let context = try XCTUnwrap(viewRenderer.capturedContext as? AContext) | ||
| XCTAssertTrue(context.trigger) | ||
| } | ||
|
|
||
| func testGetAResponseWhenGeneratorThrows() throws { | ||
| app.shutdown() | ||
| app = Application(.testing, .shared(eventLoopGroup)) | ||
| app.views.use { _ in | ||
| self.viewRenderer | ||
| } | ||
| let leafErrorMiddleware = LeafErrorMiddleware { _, _, _ -> AContext in | ||
| throw Abort(.internalServerError) | ||
| } | ||
| app.middleware = .init() | ||
| app.middleware.use(leafErrorMiddleware) | ||
|
|
||
| app.get("404") { _ async throws -> Response in | ||
| throw Abort(.notFound) | ||
| } | ||
| app.get("500") { _ async throws -> Response in | ||
| throw Abort(.internalServerError) | ||
| } | ||
|
|
||
| let response404 = try app.getResponse(to: "404") | ||
| XCTAssertEqual(response404.status, .notFound) | ||
| XCTAssertNil(viewRenderer.leafPath) | ||
|
|
||
| let response500 = try app.getResponse(to: "500") | ||
| XCTAssertEqual(response500.status, .internalServerError) | ||
| XCTAssertNil(viewRenderer.leafPath) | ||
| } | ||
| } |
Oops, something went wrong.