1e703be · typeable/servant

servant-client/test/Servant/ClientSpec.hs+1−1

compare with master

unifiedsplit

@@ -170,7 +170,7 @@ serverConfig :: Config '[ BasicAuthCheck () ]

170serverConfig = basicAuthHandler :. EmptyConfig

171

172basicAuthServer :: Application

173−basicAuthServer = serve basicAuthAPI serverConfig (const (return alice))

173+basicAuthServer = serveWithConfig basicAuthAPI serverConfig (const (return alice))

174

175{-# NOINLINE manager #-}

176manager :: C.Manager

servant-examples/basic-auth/basic-auth.hs+2−2

@@ -19,7 +19,7 @@ import Servant.Server (BasicAuthCheck (BasicAuthCheck),

19 , Unauthorized

20 ),

21 Config ((:.), EmptyConfig), Server,

22− serve)

22+ serveWithConfig)

23

24-- | let's define some types that our API returns.

25

@@ -80,7 +80,7 @@ server =

80

81-- | hello, server!

82main :: IO ()

83−main = run 8080 (serve api serverConfig server)

83+main = run 8080 (serveWithConfig api serverConfig server)

84

85{- Sample session

86

servant-server/test/Servant/Server/ErrorSpec.hs+2−2

@@ -56,7 +56,7 @@ errorOrderServer = \_ _ _ -> throwE err402

56errorOrderSpec :: Spec

57errorOrderSpec =

58 describe "HTTP error order" $

59− with (return $ serve errorOrderApi

59+ with (return $ serveWithConfig errorOrderApi

60 (errorOrderAuthCheck :. EmptyConfig)

61 errorOrderServer

62 ) $ do

@@ -183,7 +183,7 @@ errorRetryServer

183errorRetrySpec :: Spec

184errorRetrySpec =

185 describe "Handler search" $

186− with (return $ serve errorRetryApi

186+ with (return $ serveWithConfig errorRetryApi

187 (errorOrderAuthCheck :. EmptyConfig)

188 errorRetryServer

189 ) $ do

servant-server/test/Servant/ServerSpec.hs+2−2

@@ -347,13 +347,13 @@ headerSpec = describe "Servant.API.Header" $ do

347 expectsString Nothing = error "Expected a string"

348

349 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")]

351

352 it "passes the header to the handler (Int)" $

353 delete' "/" "" `shouldRespondWith` 200

354

355 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")]

357

358 it "passes the header to the handler (String)" $

359 delete' "/" "" `shouldRespondWith` 200