git.iko.soy/typeable/servant
on master help sign in
replace serve with serveWithConfig
commit1e703be15fad97b18ec387c32033a19723121d7f authoraaron levin <aaron.levin@soundcloud.com> dateSun 6 Mar 2016, 21:16 (11 years ago) parent60a5363
4 files changed+7−7
compare with master
unifiedsplit
servant-client/test/Servant/ClientSpec.hs+1−1 servant-examples/basic-auth/basic-auth.hs+2−2 servant-server/test/Servant/Server/ErrorSpec.hs+2−2 servant-server/test/Servant/ServerSpec.hs+2−2
servant-client/test/Servant/ClientSpec.hs+1−1
@@ -170,7 +170,7 @@ serverConfig :: Config '[ BasicAuthCheck () ]
170170serverConfig = basicAuthHandler :. EmptyConfig
171171
172172basicAuthServer :: Application
173−basicAuthServer = serve basicAuthAPI serverConfig (const (return alice))
173+basicAuthServer = serveWithConfig basicAuthAPI serverConfig (const (return alice))
174174
175175{-# NOINLINE manager #-}
176176manager :: C.Manager
servant-examples/basic-auth/basic-auth.hs+2−2
@@ -19,7 +19,7 @@ import Servant.Server (BasicAuthCheck (BasicAuthCheck),
1919 , Unauthorized
2020 ),
2121 Config ((:.), EmptyConfig), Server,
22− serve)
22+ serveWithConfig)
2323
2424-- | let's define some types that our API returns.
2525
@@ -80,7 +80,7 @@ server =
8080
8181-- | hello, server!
8282main :: IO ()
83−main = run 8080 (serve api serverConfig server)
83+main = run 8080 (serveWithConfig api serverConfig server)
8484
8585{- Sample session
8686
servant-server/test/Servant/Server/ErrorSpec.hs+2−2
@@ -56,7 +56,7 @@ errorOrderServer = \_ _ _ -> throwE err402
5656errorOrderSpec :: Spec
5757errorOrderSpec =
5858 describe "HTTP error order" $
59− with (return $ serve errorOrderApi
59+ with (return $ serveWithConfig errorOrderApi
6060 (errorOrderAuthCheck :. EmptyConfig)
6161 errorOrderServer
6262 ) $ do
@@ -183,7 +183,7 @@ errorRetryServer
183183errorRetrySpec :: Spec
184184errorRetrySpec =
185185 describe "Handler search" $
186− with (return $ serve errorRetryApi
186+ with (return $ serveWithConfig errorRetryApi
187187 (errorOrderAuthCheck :. EmptyConfig)
188188 errorRetryServer
189189 ) $ do
servant-server/test/Servant/ServerSpec.hs+2−2
@@ -347,13 +347,13 @@ headerSpec = describe "Servant.API.Header" $ do
347347 expectsString Nothing = error "Expected a string"
348348
349349 with (return (serve headerApi expectsInt)) $ do
350− let delete' x = Test.Hspec.Wai.request methodDelete x [("MyHeader", "5")]
350+ let delete' x = THW.request methodDelete x [("MyHeader", "5")]
351351
352352 it "passes the header to the handler (Int)" $
353353 delete' "/" "" `shouldRespondWith` 200
354354
355355 with (return (serve headerApi expectsString)) $ do
356− let delete' x = Test.Hspec.Wai.request methodDelete x [("MyHeader", "more from you")]
356+ let delete' x = THW.request methodDelete x [("MyHeader", "more from you")]
357357
358358 it "passes the header to the handler (String)" $
359359 delete' "/" "" `shouldRespondWith` 200