@@ -8,7 +8,10 @@ module Servant.Client.JSaddleSpec where
88
99import Control.Concurrent
1010 (threadDelay)
11−import Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar)
11+import Control.Concurrent.MVar
12+ (newEmptyMVar, putMVar, takeMVar)
13+import Control.Exception
14+ (handle, throwIO)
1215import Control.Monad.Trans
1316import Data.Aeson
1417import Data.ByteString
@@ -28,15 +31,16 @@ import qualified Language.Javascript.JSaddle.WebSockets as WS
2831import qualified Network.HTTP.Types as Http
2932import qualified Network.Wai as Wai
3033import Network.Wai.Handler.Warp as Warp
31−import qualified System.Process as P
3234import Network.Wai.Middleware.AddHeaders
3335import Network.Wai.Middleware.Cors
3436 (simpleCors)
3537import Network.WebSockets
3638 (defaultConnectionOptions)
39+import qualified Network.WebSockets as WS
3740import Servant.API
3841import Servant.Client.JSaddle
3942import Servant.Server
43+import qualified System.Process as P
4044import Test.Hspec
4145
4246type TestApi = ReqBody '[OctetStream] ByteString :> Post '[JSON] TestResponse
@@ -104,17 +108,23 @@ spec = do
104108 let serverApp :: IO Application
105109 serverApp = pure $ logRequest $ addCors $ serve testApi testServer
106110
107− Warp.testWithApplication serverApp $ \serverPort -> do
111+ let handler :: WS.ConnectionException -> IO ()
112+ handler WS.ConnectionClosed = return ()
113+ handler e = throwIO e
114+
115+ handle handler $ Warp.testWithApplication serverApp $ \serverPort -> do
116+ threadDelay $ 500 * 1000
108117
109118 let clientApp :: IO Application
110119 clientApp = WS.jsaddleOr defaultConnectionOptions (action serverPort >> Run.syncPoint) WS.jsaddleApp
111120
112121 Warp.testWithApplication (simpleCors <$> clientApp) $ \clientPort -> do
122+ threadDelay $ 500 * 1000
123+
113124 putStrLn $ "server http://localhost:" ++ show serverPort
114125 putStrLn $ "client http://localhost:" ++ show clientPort
115126 putStrLn $ "google-chrome-stable --headless --disable-gpu --screenshot http://localhost:" ++ show clientPort
116127
117− -- threadDelay $ 1000 * 1000 * 1000
118128
119129 -- Run headless chrome
120130 -- https://docs.travis-ci.com/user/gui-and-headless-browsers/#using-the-chrome-addon-in-the-headless-mode