cascade ws client error to promise (#2041)

vapor · Aug 27, 2019 · 098c120 · 098c120
1 parent 3a65a17
commit 098c120
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Tests/VaporTests/ApplicationTests.swift b/Tests/VaporTests/ApplicationTests.swift
@@ -394,7 +394,7 @@ final class ApplicationTests: XCTestCase {
         let app = Application.create(routes: { r, c in
             r.get("ws") { req -> EventLoopFuture<String> in
                 let promise = req.eventLoop.makePromise(of: String.self)
-                return WebSocket.connect(
+                WebSocket.connect(
                     to: "ws://echo.websocket.org/",
                     on: req.eventLoop
                 ) { ws in
@@ -403,9 +403,8 @@ final class ApplicationTests: XCTestCase {
                         promise.succeed(text)
                         ws.close().cascadeFailure(to: promise)
                     }
-                }.flatMap {
-                    return promise.futureResult
-                }
+                }.cascadeFailure(to: promise)
+                return promise.futureResult
             }
         })
         defer { app.shutdown() }