git.iko.soy/typeable/servant
on master help sign in
Fix client tests
5f8aaecGaël Deest
servant-client-core/src/Servant/Client/Core/Reexport.hs+2
compare with master
unifiedsplit
@@ -7,6 +7,7 @@ module Servant.Client.Core.Reexport
7 HasClient(..)
7 HasClient(..)
8 , foldMapUnion
8 , foldMapUnion
9 , matchUnion
9 , matchUnion
10+ , AsClientT
10
11
11 -- * Response (for @Raw@)
12 -- * Response (for @Raw@)
12 , Response
13 , Response
@@ -23,6 +24,7 @@ module Servant.Client.Core.Reexport
23 , showBaseUrl
24 , showBaseUrl
24 , parseBaseUrl
25 , parseBaseUrl
25 , InvalidBaseUrlException
26 , InvalidBaseUrlException
27+
26 ) where
28 ) where
27
29
28
30
servant-client/test/Servant/ClientTestUtils.hs+3−4
@@ -64,13 +64,11 @@ import Servant.API
64 JSON, MimeRender (mimeRender), MimeUnrender (mimeUnrender),
64 JSON, MimeRender (mimeRender), MimeUnrender (mimeUnrender),
65 NoContent (NoContent), PlainText, Post, QueryFlag, QueryParam,
65 NoContent (NoContent), PlainText, Post, QueryFlag, QueryParam,
66 QueryParams, Raw, ReqBody, StdMethod (GET), ToHttpApiData (..), UVerb, Union,
66 QueryParams, Raw, ReqBody, StdMethod (GET), ToHttpApiData (..), UVerb, Union,
67− WithStatus (WithStatus), addHeader)
67+ WithStatus (WithStatus), NamedRoutes, addHeader)
68−import Servant.API.Generic
68+import Servant.API.Generic ((:-))
69import Servant.Client
69import Servant.Client
70−import Servant.Client.Generic
71import qualified Servant.Client.Core.Auth as Auth
70import qualified Servant.Client.Core.Auth as Auth
72import Servant.Server
71import Servant.Server
73−import Servant.Server.Generic
74import Servant.Server.Experimental.Auth
72import Servant.Server.Experimental.Auth
75import Servant.Test.ComprehensiveAPI
73import Servant.Test.ComprehensiveAPI
76
74
@@ -184,6 +182,7 @@ uverbGetSuccessOrRedirect :: Bool
184 -> ClientM (Union '[WithStatus 200 Person,
182 -> ClientM (Union '[WithStatus 200 Person,
185 WithStatus 301 Text])
183 WithStatus 301 Text])
186uverbGetCreated :: ClientM (Union '[WithStatus 201 Person])
184uverbGetCreated :: ClientM (Union '[WithStatus 201 Person])
185+recordRoutes :: RecordRoutes (AsClientT ClientM)
187
186
188getRoot
187getRoot
189 :<|> getGet
188 :<|> getGet