git.iko.soy/typeable/servant
on master help sign in
Adopt http-types-0.10
0948587Oleg Grenrus
servant-server/test/Servant/ServerSpec.hs+11−2
compare with master
unifiedsplit
@@ -33,7 +33,11 @@ import Network.HTTP.Types (Status (..), hAccept, hContentType,
33 methodDelete, methodGet,
33 methodDelete, methodGet,
34 methodHead, methodPatch,
34 methodHead, methodPatch,
35 methodPost, methodPut, ok200,
35 methodPost, methodPut, ok200,
36+#if MIN_VERSION_http_types(0,10,0)
37+ imATeapot418,
38+#else
36 imATeaPot418,
39 imATeaPot418,
40+#endif
37 parseQuery)
41 parseQuery)
38import Network.Wai (Application, Request, requestHeaders, pathInfo,
42import Network.Wai (Application, Request, requestHeaders, pathInfo,
39 queryString, rawQueryString,
43 queryString, rawQueryString,
@@ -70,6 +74,11 @@ import Servant.Server.Experimental.Auth
70import Servant.Server.Internal.Context
74import Servant.Server.Internal.Context
71 (NamedContext(..))
75 (NamedContext(..))
72
76
77+#if !MIN_VERSION_http_types(0,10,0)
78+imATeapot418 :: Status
79+imATeapot418 = imATeaPot418
80+#endif
81+
73-- * comprehensive api test
82-- * comprehensive api test
74
83
75-- This declaration simply checks that all instances are in place.
84-- This declaration simply checks that all instances are in place.
@@ -662,7 +671,7 @@ basicAuthApi = Proxy
662basicAuthServer :: Server BasicAuthAPI
671basicAuthServer :: Server BasicAuthAPI
663basicAuthServer =
672basicAuthServer =
664 const (return jerry) :<|>
673 const (return jerry) :<|>
665− (Tagged $ \ _ respond -> respond $ responseLBS imATeaPot418 [] "")
674+ (Tagged $ \ _ respond -> respond $ responseLBS imATeapot418 [] "")
666
675
667basicAuthContext :: Context '[ BasicAuthCheck () ]
676basicAuthContext :: Context '[ BasicAuthCheck () ]
668basicAuthContext =
677basicAuthContext =
@@ -707,7 +716,7 @@ genAuthApi = Proxy
707
716
708genAuthServer :: Server GenAuthAPI
717genAuthServer :: Server GenAuthAPI
709genAuthServer = const (return tweety)
718genAuthServer = const (return tweety)
710− :<|> (Tagged $ \ _ respond -> respond $ responseLBS imATeaPot418 [] "")
719+ :<|> (Tagged $ \ _ respond -> respond $ responseLBS imATeapot418 [] "")
711
720
712type instance AuthServerData (AuthProtect "auth") = ()
721type instance AuthServerData (AuthProtect "auth") = ()
713
722