on master help sign in
ClientSpec split into multiple modules
commita91cde109f9b846600a5ddb3009b58e2006f236b authorMateusz Curylo <mhcurylo@gmail.com> dateSat 16 Mar 2019, 07:35 (8 years ago) parentad02280
11 files changed+771−519
servant-client/servant-client.cabal+8−1 servant-client/test/Servant/BasicAuthSpec.hs+53 servant-client/test/Servant/ClientSpec.hs−514 servant-client/test/Servant/ClientTestUtils.hs+262 servant-client/test/Servant/ConnectionErrorSpec.hs+55 servant-client/test/Servant/FailSpec.hs+75 servant-client/test/Servant/GenAuthSpec.hs+54 servant-client/test/Servant/HoistClientSpec.hs+58 servant-client/test/Servant/StreamSpec.hs+3−4 servant-client/test/Servant/SuccessSpec.hs+140 servant-client/test/Servant/WrappedApiSpec.hs+63
servant-client/servant-client.cabal+8−1
@@ -89,8 +89,15 @@ test-suite spec
8989 hs-source-dirs: test
9090 main-is: Spec.hs
9191 other-modules:
92− Servant.ClientSpec
92+ Servant.BasicAuthSpec
93+ Servant.ClientTestUtils
94+ Servant.ConnectionErrorSpec
95+ Servant.FailSpec
96+ Servant.GenAuthSpec
97+ Servant.HoistClientSpec
9398 Servant.StreamSpec
99+ Servant.SuccessSpec
100+ Servant.WrappedApiSpec
94101
95102 -- Dependencies inherited from the library. No need to specify bounds.
96103 build-depends:
servant-client/test/Servant/BasicAuthSpec.hsnew file+53
@@ -0,0 +1,53 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE FlexibleContexts #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE GADTs #-}
7+{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE OverloadedStrings #-}
9+{-# LANGUAGE PolyKinds #-}
10+{-# LANGUAGE ScopedTypeVariables #-}
11+{-# LANGUAGE TypeFamilies #-}
12+{-# LANGUAGE TypeOperators #-}
13+{-# LANGUAGE UndecidableInstances #-}
14+{-# OPTIONS_GHC -freduction-depth=100 #-}
15+{-# OPTIONS_GHC -fno-warn-orphans #-}
16+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
17+
18+module Servant.BasicAuthSpec (spec) where
19+
20+import Prelude ()
21+import Prelude.Compat
22+
23+import Control.Arrow
24+ (left)
25+import Data.Monoid ()
26+import qualified Network.HTTP.Types as HTTP
27+import Test.Hspec
28+
29+import Servant.API
30+ (BasicAuthData (..))
31+import Servant.Client
32+import Servant.ClientTestUtils
33+
34+spec :: Spec
35+spec = describe "Servant.BasicAuthSpec" $ do
36+ basicAuthSpec
37+
38+basicAuthSpec :: Spec
39+basicAuthSpec = beforeAll (startWaiApp basicAuthServer) $ afterAll endWaiApp $ do
40+ context "Authentication works when requests are properly authenticated" $ do
41+
42+ it "Authenticates a BasicAuth protected server appropriately" $ \(_,baseUrl) -> do
43+ let getBasic = client basicAuthAPI
44+ let basicAuthData = BasicAuthData "servant" "server"
45+ left show <$> runClient (getBasic basicAuthData) baseUrl `shouldReturn` Right alice
46+
47+ context "Authentication is rejected when requests are not authenticated properly" $ do
48+
49+ it "Authenticates a BasicAuth protected server appropriately" $ \(_,baseUrl) -> do
50+ let getBasic = client basicAuthAPI
51+ let basicAuthData = BasicAuthData "not" "password"
52+ Left (FailureResponse _ r) <- runClient (getBasic basicAuthData) baseUrl
53+ responseStatusCode r `shouldBe` HTTP.Status 403 "Forbidden"
servant-client/test/Servant/ClientSpec.hsdeleted−514
@@ -1,514 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE ConstraintKinds #-}
3−{-# LANGUAGE DataKinds #-}
4−{-# LANGUAGE DeriveGeneric #-}
5−{-# LANGUAGE FlexibleContexts #-}
6−{-# LANGUAGE FlexibleInstances #-}
7−{-# LANGUAGE FunctionalDependencies #-}
8−{-# LANGUAGE GADTs #-}
9−{-# LANGUAGE MultiParamTypeClasses #-}
10−{-# LANGUAGE OverloadedStrings #-}
11−{-# LANGUAGE PolyKinds #-}
12−{-# LANGUAGE RecordWildCards #-}
13−{-# LANGUAGE ScopedTypeVariables #-}
14−{-# LANGUAGE StandaloneDeriving #-}
15−{-# LANGUAGE TypeApplications #-}
16−{-# LANGUAGE TypeFamilies #-}
17−{-# LANGUAGE TypeOperators #-}
18−{-# LANGUAGE UndecidableInstances #-}
19−{-# OPTIONS_GHC -freduction-depth=100 #-}
20−{-# OPTIONS_GHC -fno-warn-orphans #-}
21−{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
22−
23−module Servant.ClientSpec (spec, Person(..), startWaiApp, endWaiApp) where
24−
25−import Prelude ()
26−import Prelude.Compat
27−
28−import Control.Arrow
29− (left)
30−import Control.Concurrent
31− (ThreadId, forkIO, killThread)
32−import Control.Concurrent.STM
33− (atomically)
34−import Control.Concurrent.STM.TVar
35− (newTVar, readTVar)
36−import Control.Exception
37− (bracket, fromException)
38−import Control.Monad.Error.Class
39− (throwError)
40−import Data.Aeson
41−import Data.Char
42− (chr, isPrint)
43−import Data.Foldable
44− (forM_, toList)
45−import Data.Maybe
46− (isJust, listToMaybe)
47−import Data.Monoid ()
48−import Data.Proxy
49−import Data.Semigroup
50− ((<>))
51−import GHC.Generics
52− (Generic)
53−import qualified Network.HTTP.Client as C
54−import qualified Network.HTTP.Types as HTTP
55−import Network.Socket
56−import qualified Network.Wai as Wai
57−import Network.Wai.Handler.Warp
58−import System.IO.Unsafe
59− (unsafePerformIO)
60−import Test.Hspec
61−import Test.Hspec.QuickCheck
62−import Test.HUnit
63−import Test.QuickCheck
64−import Web.FormUrlEncoded
65− (FromForm, ToForm)
66−
67−import Servant.API
68− ((:<|>) ((:<|>)), (:>), AuthProtect, BasicAuth,
69− BasicAuthData (..), Capture, CaptureAll, Delete,
70− DeleteNoContent, EmptyAPI, FormUrlEncoded, Get, Header,
71− Headers, JSON, NoContent (NoContent), Post, Put, QueryFlag,
72− QueryParam, QueryParams, Raw, ReqBody, addHeader, getHeaders)
73−import Servant.Client
74−import qualified Servant.Client.Core.Auth as Auth
75−import qualified Servant.Client.Core.Request as Req
76−import Servant.Server
77−import Servant.Server.Experimental.Auth
78−import Servant.Test.ComprehensiveAPI
79−
80−-- This declaration simply checks that all instances are in place.
81−_ = client comprehensiveAPIWithoutStreaming
82−
83−spec :: Spec
84−spec = describe "Servant.Client" $ do
85− sucessSpec
86− failSpec
87− wrappedApiSpec
88− basicAuthSpec
89− genAuthSpec
90− hoistClientSpec
91− connectionErrorSpec
92−
93−-- * test data types
94−
95−data Person = Person
96− { _name :: String
97− , _age :: Integer
98− } deriving (Eq, Show, Generic)
99−
100−instance ToJSON Person
101−instance FromJSON Person
102−
103−instance ToForm Person
104−instance FromForm Person
105−
106−instance Arbitrary Person where
107− arbitrary = Person <$> arbitrary <*> arbitrary
108−
109−alice :: Person
110−alice = Person "Alice" 42
111−
112−carol :: Person
113−carol = Person "Carol" 17
114−
115−type TestHeaders = '[Header "X-Example1" Int, Header "X-Example2" String]
116−
117−type Api =
118− Get '[JSON] Person
119− :<|> "get" :> Get '[JSON] Person
120− :<|> "deleteEmpty" :> DeleteNoContent '[JSON] NoContent
121− :<|> "capture" :> Capture "name" String :> Get '[JSON,FormUrlEncoded] Person
122− :<|> "captureAll" :> CaptureAll "names" String :> Get '[JSON] [Person]
123− :<|> "body" :> ReqBody '[FormUrlEncoded,JSON] Person :> Post '[JSON] Person
124− :<|> "param" :> QueryParam "name" String :> Get '[FormUrlEncoded,JSON] Person
125− :<|> "params" :> QueryParams "names" String :> Get '[JSON] [Person]
126− :<|> "flag" :> QueryFlag "flag" :> Get '[JSON] Bool
127− :<|> "rawSuccess" :> Raw
128− :<|> "rawFailure" :> Raw
129− :<|> "multiple" :>
130− Capture "first" String :>
131− QueryParam "second" Int :>
132− QueryFlag "third" :>
133− ReqBody '[JSON] [(String, [Rational])] :>
134− Get '[JSON] (String, Maybe Int, Bool, [(String, [Rational])])
135− :<|> "headers" :> Get '[JSON] (Headers TestHeaders Bool)
136− :<|> "deleteContentType" :> DeleteNoContent '[JSON] NoContent
137− :<|> "redirectWithCookie" :> Raw
138− :<|> "empty" :> EmptyAPI
139−
140−api :: Proxy Api
141−api = Proxy
142−
143−getRoot :: ClientM Person
144−getGet :: ClientM Person
145−getDeleteEmpty :: ClientM NoContent
146−getCapture :: String -> ClientM Person
147−getCaptureAll :: [String] -> ClientM [Person]
148−getBody :: Person -> ClientM Person
149−getQueryParam :: Maybe String -> ClientM Person
150−getQueryParams :: [String] -> ClientM [Person]
151−getQueryFlag :: Bool -> ClientM Bool
152−getRawSuccess :: HTTP.Method -> ClientM Response
153−getRawFailure :: HTTP.Method -> ClientM Response
154−getMultiple :: String -> Maybe Int -> Bool -> [(String, [Rational])]
155− -> ClientM (String, Maybe Int, Bool, [(String, [Rational])])
156−getRespHeaders :: ClientM (Headers TestHeaders Bool)
157−getDeleteContentType :: ClientM NoContent
158−getRedirectWithCookie :: HTTP.Method -> ClientM Response
159−
160−getRoot
161− :<|> getGet
162− :<|> getDeleteEmpty
163− :<|> getCapture
164− :<|> getCaptureAll
165− :<|> getBody
166− :<|> getQueryParam
167− :<|> getQueryParams
168− :<|> getQueryFlag
169− :<|> getRawSuccess
170− :<|> getRawFailure
171− :<|> getMultiple
172− :<|> getRespHeaders
173− :<|> getDeleteContentType
174− :<|> getRedirectWithCookie
175− :<|> EmptyClient = client api
176−
177−server :: Application
178−server = serve api (
179− return carol
180− :<|> return alice
181− :<|> return NoContent
182− :<|> (\ name -> return $ Person name 0)
183− :<|> (\ names -> return (zipWith Person names [0..]))
184− :<|> return
185− :<|> (\ name -> case name of
186− Just "alice" -> return alice
187− Just n -> throwError $ ServerError 400 (n ++ " not found") "" []
188− Nothing -> throwError $ ServerError 400 "missing parameter" "" [])
189− :<|> (\ names -> return (zipWith Person names [0..]))
190− :<|> return
191− :<|> (Tagged $ \ _request respond -> respond $ Wai.responseLBS HTTP.ok200 [] "rawSuccess")
192− :<|> (Tagged $ \ _request respond -> respond $ Wai.responseLBS HTTP.badRequest400 [] "rawFailure")
193− :<|> (\ a b c d -> return (a, b, c, d))
194− :<|> (return $ addHeader 1729 $ addHeader "eg2" True)
195− :<|> return NoContent
196− :<|> (Tagged $ \ _request respond -> respond $ Wai.responseLBS HTTP.found302 [("Location", "testlocation"), ("Set-Cookie", "testcookie=test")] "")
197− :<|> emptyServer)
198−
199−type FailApi =
200− "get" :> Raw
201− :<|> "capture" :> Capture "name" String :> Raw
202− :<|> "body" :> Raw
203−failApi :: Proxy FailApi
204−failApi = Proxy
205−
206−failServer :: Application
207−failServer = serve failApi (
208− (Tagged $ \ _request respond -> respond $ Wai.responseLBS HTTP.ok200 [] "")
209− :<|> (\ _capture -> Tagged $ \_request respond -> respond $ Wai.responseLBS HTTP.ok200 [("content-type", "application/json")] "")
210− :<|> (Tagged $ \_request respond -> respond $ Wai.responseLBS HTTP.ok200 [("content-type", "fooooo")] "")
211− )
212−
213−-- * basic auth stuff
214−
215−type BasicAuthAPI =
216− BasicAuth "foo-realm" () :> "private" :> "basic" :> Get '[JSON] Person
217−
218−basicAuthAPI :: Proxy BasicAuthAPI
219−basicAuthAPI = Proxy
220−
221−basicAuthHandler :: BasicAuthCheck ()
222−basicAuthHandler =
223− let check (BasicAuthData username password) =
224− if username == "servant" && password == "server"
225− then return (Authorized ())
226− else return Unauthorized
227− in BasicAuthCheck check
228−
229−basicServerContext :: Context '[ BasicAuthCheck () ]
230−basicServerContext = basicAuthHandler :. EmptyContext
231−
232−basicAuthServer :: Application
233−basicAuthServer = serveWithContext basicAuthAPI basicServerContext (const (return alice))
234−
235−-- * general auth stuff
236−
237−type GenAuthAPI =
238− AuthProtect "auth-tag" :> "private" :> "auth" :> Get '[JSON] Person
239−
240−genAuthAPI :: Proxy GenAuthAPI
241−genAuthAPI = Proxy
242−
243−type instance AuthServerData (AuthProtect "auth-tag") = ()
244−type instance Auth.AuthClientData (AuthProtect "auth-tag") = ()
245−
246−genAuthHandler :: AuthHandler Wai.Request ()
247−genAuthHandler =
248− let handler req = case lookup "AuthHeader" (Wai.requestHeaders req) of
249− Nothing -> throwError (err401 { errBody = "Missing auth header" })
250− Just _ -> return ()
251− in mkAuthHandler handler
252−
253−genAuthServerContext :: Context '[ AuthHandler Wai.Request () ]
254−genAuthServerContext = genAuthHandler :. EmptyContext
255−
256−genAuthServer :: Application
257−genAuthServer = serveWithContext genAuthAPI genAuthServerContext (const (return alice))
258−
259−{-# NOINLINE manager' #-}
260−manager' :: C.Manager
261−manager' = unsafePerformIO $ C.newManager C.defaultManagerSettings
262−
263−runClient :: ClientM a -> BaseUrl -> IO (Either ClientError a)
264−runClient x baseUrl' = runClientM x (mkClientEnv manager' baseUrl')
265−
266−sucessSpec :: Spec
267−sucessSpec = beforeAll (startWaiApp server) $ afterAll endWaiApp $ do
268− it "Servant.API.Get root" $ \(_, baseUrl) -> do
269− left show <$> runClient getRoot baseUrl `shouldReturn` Right carol
270−
271− it "Servant.API.Get" $ \(_, baseUrl) -> do
272− left show <$> runClient getGet baseUrl `shouldReturn` Right alice
273−
274− describe "Servant.API.Delete" $ do
275− it "allows empty content type" $ \(_, baseUrl) -> do
276− left show <$> runClient getDeleteEmpty baseUrl `shouldReturn` Right NoContent
277−
278− it "allows content type" $ \(_, baseUrl) -> do
279− left show <$> runClient getDeleteContentType baseUrl `shouldReturn` Right NoContent
280−
281− it "Servant.API.Capture" $ \(_, baseUrl) -> do
282− left show <$> runClient (getCapture "Paula") baseUrl `shouldReturn` Right (Person "Paula" 0)
283−
284− it "Servant.API.CaptureAll" $ \(_, baseUrl) -> do
285− let expected = [(Person "Paula" 0), (Person "Peta" 1)]
286− left show <$> runClient (getCaptureAll ["Paula", "Peta"]) baseUrl `shouldReturn` Right expected
287−
288− it "Servant.API.ReqBody" $ \(_, baseUrl) -> do
289− let p = Person "Clara" 42
290− left show <$> runClient (getBody p) baseUrl `shouldReturn` Right p
291−
292− it "Servant.API FailureResponse" $ \(_, baseUrl) -> do
293− left show <$> runClient (getQueryParam (Just "alice")) baseUrl `shouldReturn` Right alice
294− Left (FailureResponse req _) <- runClient (getQueryParam (Just "bob")) baseUrl
295− Req.requestPath req `shouldBe` (baseUrl, "/param")
296− toList (Req.requestQueryString req) `shouldBe` [("name", Just "bob")]
297− Req.requestMethod req `shouldBe` HTTP.methodGet
298−
299− it "Servant.API.QueryParam" $ \(_, baseUrl) -> do
300− left show <$> runClient (getQueryParam (Just "alice")) baseUrl `shouldReturn` Right alice
301− Left (FailureResponse _ r) <- runClient (getQueryParam (Just "bob")) baseUrl
302− responseStatusCode r `shouldBe` HTTP.Status 400 "bob not found"
303−
304− it "Servant.API.QueryParam.QueryParams" $ \(_, baseUrl) -> do
305− left show <$> runClient (getQueryParams []) baseUrl `shouldReturn` Right []
306− left show <$> runClient (getQueryParams ["alice", "bob"]) baseUrl
307− `shouldReturn` Right [Person "alice" 0, Person "bob" 1]
308−
309− context "Servant.API.QueryParam.QueryFlag" $
310− forM_ [False, True] $ \ flag -> it (show flag) $ \(_, baseUrl) -> do
311− left show <$> runClient (getQueryFlag flag) baseUrl `shouldReturn` Right flag
312−
313− it "Servant.API.Raw on success" $ \(_, baseUrl) -> do
314− res <- runClient (getRawSuccess HTTP.methodGet) baseUrl
315− case res of
316− Left e -> assertFailure $ show e
317− Right r -> do
318− responseStatusCode r `shouldBe` HTTP.status200
319− responseBody r `shouldBe` "rawSuccess"
320−
321− it "Servant.API.Raw should return a Left in case of failure" $ \(_, baseUrl) -> do
322− res <- runClient (getRawFailure HTTP.methodGet) baseUrl
323− case res of
324− Right _ -> assertFailure "expected Left, but got Right"
325− Left (FailureResponse _ r) -> do
326− responseStatusCode r `shouldBe` HTTP.status400
327− responseBody r `shouldBe` "rawFailure"
328− Left e -> assertFailure $ "expected FailureResponse, but got " ++ show e
329−
330− it "Returns headers appropriately" $ \(_, baseUrl) -> do
331− res <- runClient getRespHeaders baseUrl
332− case res of
333− Left e -> assertFailure $ show e
334− Right val -> getHeaders val `shouldBe` [("X-Example1", "1729"), ("X-Example2", "eg2")]
335−
336− it "Stores Cookie in CookieJar after a redirect" $ \(_, baseUrl) -> do
337− mgr <- C.newManager C.defaultManagerSettings
338− cj <- atomically . newTVar $ C.createCookieJar []
339− _ <- runClientM (getRedirectWithCookie HTTP.methodGet) (ClientEnv mgr baseUrl (Just cj))
340− cookie <- listToMaybe . C.destroyCookieJar <$> atomically (readTVar cj)
341− C.cookie_name <$> cookie `shouldBe` Just "testcookie"
342− C.cookie_value <$> cookie `shouldBe` Just "test"
343−
344− modifyMaxSuccess (const 20) $ do
345− it "works for a combination of Capture, QueryParam, QueryFlag and ReqBody" $ \(_, baseUrl) ->
346− property $ forAllShrink pathGen shrink $ \(NonEmpty cap) num flag body ->
347− ioProperty $ do
348− result <- left show <$> runClient (getMultiple cap num flag body) baseUrl
349− return $
350− result === Right (cap, num, flag, body)
351−
352−
353−wrappedApiSpec :: Spec
354−wrappedApiSpec = describe "error status codes" $ do
355− let serveW api = serve api $ throwError $ ServerError 500 "error message" "" []
356− context "are correctly handled by the client" $
357− let test :: (WrappedApi, String) -> Spec
358− test (WrappedApi api, desc) =
359− it desc $ bracket (startWaiApp $ serveW api) endWaiApp $ \(_, baseUrl) -> do
360− let getResponse :: ClientM ()
361− getResponse = client api
362− Left (FailureResponse _ r) <- runClient getResponse baseUrl
363− responseStatusCode r `shouldBe` (HTTP.Status 500 "error message")
364− in mapM_ test $
365− (WrappedApi (Proxy :: Proxy (Delete '[JSON] ())), "Delete") :
366− (WrappedApi (Proxy :: Proxy (Get '[JSON] ())), "Get") :
367− (WrappedApi (Proxy :: Proxy (Post '[JSON] ())), "Post") :
368− (WrappedApi (Proxy :: Proxy (Put '[JSON] ())), "Put") :
369− []
370−
371−failSpec :: Spec
372−failSpec = beforeAll (startWaiApp failServer) $ afterAll endWaiApp $ do
373−
374− context "client returns errors appropriately" $ do
375− it "reports FailureResponse" $ \(_, baseUrl) -> do
376− let (_ :<|> _ :<|> getDeleteEmpty :<|> _) = client api
377− Left res <- runClient getDeleteEmpty baseUrl
378− case res of
379− FailureResponse _ r | responseStatusCode r == HTTP.status404 -> return ()
380− _ -> fail $ "expected 404 response, but got " <> show res
381−
382− it "reports DecodeFailure" $ \(_, baseUrl) -> do
383− let (_ :<|> _ :<|> _ :<|> getCapture :<|> _) = client api
384− Left res <- runClient (getCapture "foo") baseUrl
385− case res of
386− DecodeFailure _ _ -> return ()
387− _ -> fail $ "expected DecodeFailure, but got " <> show res
388−
389− it "reports ConnectionError" $ \_ -> do
390− let (getGetWrongHost :<|> _) = client api
391− Left res <- runClient getGetWrongHost (BaseUrl Http "127.0.0.1" 19872 "")
392− case res of
393− ConnectionError _ -> return ()
394− _ -> fail $ "expected ConnectionError, but got " <> show res
395−
396− it "reports UnsupportedContentType" $ \(_, baseUrl) -> do
397− let (_ :<|> getGet :<|> _ ) = client api
398− Left res <- runClient getGet baseUrl
399− case res of
400− UnsupportedContentType ("application/octet-stream") _ -> return ()
401− _ -> fail $ "expected UnsupportedContentType, but got " <> show res
402−
403− it "reports InvalidContentTypeHeader" $ \(_, baseUrl) -> do
404− let (_ :<|> _ :<|> _ :<|> _ :<|> _ :<|> getBody :<|> _) = client api
405− Left res <- runClient (getBody alice) baseUrl
406− case res of
407− InvalidContentTypeHeader _ -> return ()
408− _ -> fail $ "expected InvalidContentTypeHeader, but got " <> show res
409−
410−data WrappedApi where
411− WrappedApi :: (HasServer (api :: *) '[], Server api ~ Handler a,
412− HasClient ClientM api, Client ClientM api ~ ClientM ()) =>
413− Proxy api -> WrappedApi
414−
415−basicAuthSpec :: Spec
416−basicAuthSpec = beforeAll (startWaiApp basicAuthServer) $ afterAll endWaiApp $ do
417− context "Authentication works when requests are properly authenticated" $ do
418−
419− it "Authenticates a BasicAuth protected server appropriately" $ \(_,baseUrl) -> do
420− let getBasic = client basicAuthAPI
421− let basicAuthData = BasicAuthData "servant" "server"
422− left show <$> runClient (getBasic basicAuthData) baseUrl `shouldReturn` Right alice
423−
424− context "Authentication is rejected when requests are not authenticated properly" $ do
425−
426− it "Authenticates a BasicAuth protected server appropriately" $ \(_,baseUrl) -> do
427− let getBasic = client basicAuthAPI
428− let basicAuthData = BasicAuthData "not" "password"
429− Left (FailureResponse _ r) <- runClient (getBasic basicAuthData) baseUrl
430− responseStatusCode r `shouldBe` HTTP.Status 403 "Forbidden"
431−
432−genAuthSpec :: Spec
433−genAuthSpec = beforeAll (startWaiApp genAuthServer) $ afterAll endWaiApp $ do
434− context "Authentication works when requests are properly authenticated" $ do
435−
436− it "Authenticates a AuthProtect protected server appropriately" $ \(_, baseUrl) -> do
437− let getProtected = client genAuthAPI
438− let authRequest = Auth.mkAuthenticatedRequest () (\_ req -> Req.addHeader "AuthHeader" ("cool" :: String) req)
439− left show <$> runClient (getProtected authRequest) baseUrl `shouldReturn` Right alice
440−
441− context "Authentication is rejected when requests are not authenticated properly" $ do
442−
443− it "Authenticates a AuthProtect protected server appropriately" $ \(_, baseUrl) -> do
444− let getProtected = client genAuthAPI
445− let authRequest = Auth.mkAuthenticatedRequest () (\_ req -> Req.addHeader "Wrong" ("header" :: String) req)
446− Left (FailureResponse _ r) <- runClient (getProtected authRequest) baseUrl
447− responseStatusCode r `shouldBe` (HTTP.Status 401 "Unauthorized")
448−
449−-- * hoistClient
450−
451−type HoistClientAPI = Get '[JSON] Int :<|> Capture "n" Int :> Post '[JSON] Int
452−
453−hoistClientAPI :: Proxy HoistClientAPI
454−hoistClientAPI = Proxy
455−
456−hoistClientServer :: Application -- implements HoistClientAPI
457−hoistClientServer = serve hoistClientAPI $ return 5 :<|> (\n -> return n)
458−
459−hoistClientSpec :: Spec
460−hoistClientSpec = beforeAll (startWaiApp hoistClientServer) $ afterAll endWaiApp $ do
461− describe "Servant.Client.hoistClient" $ do
462− it "allows us to GET/POST/... requests in IO instead of ClientM" $ \(_, baseUrl) -> do
463− let (getInt :<|> postInt)
464− = hoistClient hoistClientAPI
465− (fmap (either (error . show) id) . flip runClient baseUrl)
466− (client hoistClientAPI)
467−
468− getInt `shouldReturn` 5
469− postInt 5 `shouldReturn` 5
470−
471−-- * ConnectionError
472−type ConnectionErrorAPI = Get '[JSON] Int
473−
474−connectionErrorAPI :: Proxy ConnectionErrorAPI
475−connectionErrorAPI = Proxy
476−
477−connectionErrorSpec :: Spec
478−connectionErrorSpec = describe "Servant.Client.ClientError" $
479− it "correctly catches ConnectionErrors when the HTTP request can't go through" $ do
480− let getInt = client connectionErrorAPI
481− let baseUrl' = BaseUrl Http "example.invalid" 80 ""
482− let isHttpError (Left (ConnectionError e)) = isJust $ fromException @C.HttpException e
483− isHttpError _ = False
484− (isHttpError <$> runClient getInt baseUrl') `shouldReturn` True
485−
486−-- * utils
487−
488−startWaiApp :: Application -> IO (ThreadId, BaseUrl)
489−startWaiApp app = do
490− (port, socket) <- openTestSocket
491− let settings = setPort port $ defaultSettings
492− thread <- forkIO $ runSettingsSocket settings socket app
493− return (thread, BaseUrl Http "localhost" port "")
494−
495−
496−endWaiApp :: (ThreadId, BaseUrl) -> IO ()
497−endWaiApp (thread, _) = killThread thread
498−
499−openTestSocket :: IO (Port, Socket)
500−openTestSocket = do
501− s <- socket AF_INET Stream defaultProtocol
502− let localhost = tupleToHostAddress (127, 0, 0, 1)
503− bind s (SockAddrInet defaultPort localhost)
504− listen s 1
505− port <- socketPort s
506− return (fromIntegral port, s)
507−
508−pathGen :: Gen (NonEmptyList Char)
509−pathGen = fmap NonEmpty path
510− where
511− path = listOf1 $ elements $
512− filter (not . (`elem` ("?%[]/#;" :: String))) $
513− filter isPrint $
514− map chr [0..127]
servant-client/test/Servant/ClientTestUtils.hsnew file+262
@@ -0,0 +1,262 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE DeriveGeneric #-}
5+{-# LANGUAGE FlexibleContexts #-}
6+{-# LANGUAGE FlexibleInstances #-}
7+{-# LANGUAGE GADTs #-}
8+{-# LANGUAGE MultiParamTypeClasses #-}
9+{-# LANGUAGE OverloadedStrings #-}
10+{-# LANGUAGE PolyKinds #-}
11+{-# LANGUAGE ScopedTypeVariables #-}
12+{-# LANGUAGE TypeFamilies #-}
13+{-# LANGUAGE TypeOperators #-}
14+{-# LANGUAGE UndecidableInstances #-}
15+{-# OPTIONS_GHC -freduction-depth=100 #-}
16+{-# OPTIONS_GHC -fno-warn-orphans #-}
17+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
18+
19+module Servant.ClientTestUtils where
20+
21+import Prelude ()
22+import Prelude.Compat
23+
24+import Control.Concurrent
25+ (ThreadId, forkIO, killThread)
26+import Control.Monad.Error.Class
27+ (throwError)
28+import Data.Aeson
29+import Data.Char
30+ (chr, isPrint)
31+import Data.Monoid ()
32+import Data.Proxy
33+import GHC.Generics
34+ (Generic)
35+import qualified Network.HTTP.Client as C
36+import qualified Network.HTTP.Types as HTTP
37+import Network.Socket
38+import qualified Network.Wai as Wai
39+import Network.Wai.Handler.Warp
40+import System.IO.Unsafe
41+ (unsafePerformIO)
42+import Test.QuickCheck
43+import Web.FormUrlEncoded
44+ (FromForm, ToForm)
45+
46+import Servant.API
47+ ((:<|>) ((:<|>)), (:>), AuthProtect, BasicAuth,
48+ BasicAuthData (..), Capture, CaptureAll,
49+ DeleteNoContent, EmptyAPI, FormUrlEncoded, Get, Header,
50+ Headers, JSON, NoContent (NoContent), Post, QueryFlag,
51+ QueryParam, QueryParams, Raw, ReqBody, addHeader)
52+import Servant.Client
53+import qualified Servant.Client.Core.Auth as Auth
54+import Servant.Server
55+import Servant.Server.Experimental.Auth
56+import Servant.Test.ComprehensiveAPI
57+
58+-- This declaration simply checks that all instances are in place.
59+_ = client comprehensiveAPIWithoutStreaming
60+
61+-- * test data types
62+
63+data Person = Person
64+ { _name :: String
65+ , _age :: Integer
66+ } deriving (Eq, Show, Generic)
67+
68+instance ToJSON Person
69+instance FromJSON Person
70+
71+instance ToForm Person
72+instance FromForm Person
73+
74+instance Arbitrary Person where
75+ arbitrary = Person <$> arbitrary <*> arbitrary
76+
77+alice :: Person
78+alice = Person "Alice" 42
79+
80+carol :: Person
81+carol = Person "Carol" 17
82+
83+type TestHeaders = '[Header "X-Example1" Int, Header "X-Example2" String]
84+
85+type Api =
86+ Get '[JSON] Person
87+ :<|> "get" :> Get '[JSON] Person
88+ :<|> "deleteEmpty" :> DeleteNoContent '[JSON] NoContent
89+ :<|> "capture" :> Capture "name" String :> Get '[JSON,FormUrlEncoded] Person
90+ :<|> "captureAll" :> CaptureAll "names" String :> Get '[JSON] [Person]
91+ :<|> "body" :> ReqBody '[FormUrlEncoded,JSON] Person :> Post '[JSON] Person
92+ :<|> "param" :> QueryParam "name" String :> Get '[FormUrlEncoded,JSON] Person
93+ :<|> "params" :> QueryParams "names" String :> Get '[JSON] [Person]
94+ :<|> "flag" :> QueryFlag "flag" :> Get '[JSON] Bool
95+ :<|> "rawSuccess" :> Raw
96+ :<|> "rawFailure" :> Raw
97+ :<|> "multiple" :>
98+ Capture "first" String :>
99+ QueryParam "second" Int :>
100+ QueryFlag "third" :>
101+ ReqBody '[JSON] [(String, [Rational])] :>
102+ Get '[JSON] (String, Maybe Int, Bool, [(String, [Rational])])
103+ :<|> "headers" :> Get '[JSON] (Headers TestHeaders Bool)
104+ :<|> "deleteContentType" :> DeleteNoContent '[JSON] NoContent
105+ :<|> "redirectWithCookie" :> Raw
106+ :<|> "empty" :> EmptyAPI
107+
108+api :: Proxy Api
109+api = Proxy
110+
111+getRoot :: ClientM Person
112+getGet :: ClientM Person
113+getDeleteEmpty :: ClientM NoContent
114+getCapture :: String -> ClientM Person
115+getCaptureAll :: [String] -> ClientM [Person]
116+getBody :: Person -> ClientM Person
117+getQueryParam :: Maybe String -> ClientM Person
118+getQueryParams :: [String] -> ClientM [Person]
119+getQueryFlag :: Bool -> ClientM Bool
120+getRawSuccess :: HTTP.Method -> ClientM Response
121+getRawFailure :: HTTP.Method -> ClientM Response
122+getMultiple :: String -> Maybe Int -> Bool -> [(String, [Rational])]
123+ -> ClientM (String, Maybe Int, Bool, [(String, [Rational])])
124+getRespHeaders :: ClientM (Headers TestHeaders Bool)
125+getDeleteContentType :: ClientM NoContent
126+getRedirectWithCookie :: HTTP.Method -> ClientM Response
127+
128+getRoot
129+ :<|> getGet
130+ :<|> getDeleteEmpty
131+ :<|> getCapture
132+ :<|> getCaptureAll
133+ :<|> getBody
134+ :<|> getQueryParam
135+ :<|> getQueryParams
136+ :<|> getQueryFlag
137+ :<|> getRawSuccess
138+ :<|> getRawFailure
139+ :<|> getMultiple
140+ :<|> getRespHeaders
141+ :<|> getDeleteContentType
142+ :<|> getRedirectWithCookie
143+ :<|> EmptyClient = client api
144+
145+server :: Application
146+server = serve api (
147+ return carol
148+ :<|> return alice
149+ :<|> return NoContent
150+ :<|> (\ name -> return $ Person name 0)
151+ :<|> (\ names -> return (zipWith Person names [0..]))
152+ :<|> return
153+ :<|> (\ name -> case name of
154+ Just "alice" -> return alice
155+ Just n -> throwError $ ServerError 400 (n ++ " not found") "" []
156+ Nothing -> throwError $ ServerError 400 "missing parameter" "" [])
157+ :<|> (\ names -> return (zipWith Person names [0..]))
158+ :<|> return
159+ :<|> (Tagged $ \ _request respond -> respond $ Wai.responseLBS HTTP.ok200 [] "rawSuccess")
160+ :<|> (Tagged $ \ _request respond -> respond $ Wai.responseLBS HTTP.badRequest400 [] "rawFailure")
161+ :<|> (\ a b c d -> return (a, b, c, d))
162+ :<|> (return $ addHeader 1729 $ addHeader "eg2" True)
163+ :<|> return NoContent
164+ :<|> (Tagged $ \ _request respond -> respond $ Wai.responseLBS HTTP.found302 [("Location", "testlocation"), ("Set-Cookie", "testcookie=test")] "")
165+ :<|> emptyServer)
166+
167+type FailApi =
168+ "get" :> Raw
169+ :<|> "capture" :> Capture "name" String :> Raw
170+ :<|> "body" :> Raw
171+failApi :: Proxy FailApi
172+failApi = Proxy
173+
174+failServer :: Application
175+failServer = serve failApi (
176+ (Tagged $ \ _request respond -> respond $ Wai.responseLBS HTTP.ok200 [] "")
177+ :<|> (\ _capture -> Tagged $ \_request respond -> respond $ Wai.responseLBS HTTP.ok200 [("content-type", "application/json")] "")
178+ :<|> (Tagged $ \_request respond -> respond $ Wai.responseLBS HTTP.ok200 [("content-type", "fooooo")] "")
179+ )
180+
181+-- * basic auth stuff
182+
183+type BasicAuthAPI =
184+ BasicAuth "foo-realm" () :> "private" :> "basic" :> Get '[JSON] Person
185+
186+basicAuthAPI :: Proxy BasicAuthAPI
187+basicAuthAPI = Proxy
188+
189+basicAuthHandler :: BasicAuthCheck ()
190+basicAuthHandler =
191+ let check (BasicAuthData username password) =
192+ if username == "servant" && password == "server"
193+ then return (Authorized ())
194+ else return Unauthorized
195+ in BasicAuthCheck check
196+
197+basicServerContext :: Context '[ BasicAuthCheck () ]
198+basicServerContext = basicAuthHandler :. EmptyContext
199+
200+basicAuthServer :: Application
201+basicAuthServer = serveWithContext basicAuthAPI basicServerContext (const (return alice))
202+
203+-- * general auth stuff
204+
205+type GenAuthAPI =
206+ AuthProtect "auth-tag" :> "private" :> "auth" :> Get '[JSON] Person
207+
208+genAuthAPI :: Proxy GenAuthAPI
209+genAuthAPI = Proxy
210+
211+type instance AuthServerData (AuthProtect "auth-tag") = ()
212+type instance Auth.AuthClientData (AuthProtect "auth-tag") = ()
213+
214+genAuthHandler :: AuthHandler Wai.Request ()
215+genAuthHandler =
216+ let handler req = case lookup "AuthHeader" (Wai.requestHeaders req) of
217+ Nothing -> throwError (err401 { errBody = "Missing auth header" })
218+ Just _ -> return ()
219+ in mkAuthHandler handler
220+
221+genAuthServerContext :: Context '[ AuthHandler Wai.Request () ]
222+genAuthServerContext = genAuthHandler :. EmptyContext
223+
224+genAuthServer :: Application
225+genAuthServer = serveWithContext genAuthAPI genAuthServerContext (const (return alice))
226+
227+{-# NOINLINE manager' #-}
228+manager' :: C.Manager
229+manager' = unsafePerformIO $ C.newManager C.defaultManagerSettings
230+
231+runClient :: ClientM a -> BaseUrl -> IO (Either ClientError a)
232+runClient x baseUrl' = runClientM x (mkClientEnv manager' baseUrl')
233+
234+-- * utils
235+
236+startWaiApp :: Application -> IO (ThreadId, BaseUrl)
237+startWaiApp app = do
238+ (port, socket) <- openTestSocket
239+ let settings = setPort port defaultSettings
240+ thread <- forkIO $ runSettingsSocket settings socket app
241+ return (thread, BaseUrl Http "localhost" port "")
242+
243+
244+endWaiApp :: (ThreadId, BaseUrl) -> IO ()
245+endWaiApp (thread, _) = killThread thread
246+
247+openTestSocket :: IO (Port, Socket)
248+openTestSocket = do
249+ s <- socket AF_INET Stream defaultProtocol
250+ let localhost = tupleToHostAddress (127, 0, 0, 1)
251+ bind s (SockAddrInet defaultPort localhost)
252+ listen s 1
253+ port <- socketPort s
254+ return (fromIntegral port, s)
255+
256+pathGen :: Gen (NonEmptyList Char)
257+pathGen = fmap NonEmpty path
258+ where
259+ path = listOf1 $ elements $
260+ filter (not . (`elem` ("?%[]/#;" :: String))) $
261+ filter isPrint $
262+ map chr [0..127]
servant-client/test/Servant/ConnectionErrorSpec.hsnew file+55
@@ -0,0 +1,55 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE FlexibleContexts #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE GADTs #-}
7+{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE OverloadedStrings #-}
9+{-# LANGUAGE PolyKinds #-}
10+{-# LANGUAGE ScopedTypeVariables #-}
11+{-# LANGUAGE TypeApplications #-}
12+{-# LANGUAGE TypeFamilies #-}
13+{-# LANGUAGE TypeOperators #-}
14+{-# LANGUAGE UndecidableInstances #-}
15+{-# OPTIONS_GHC -freduction-depth=100 #-}
16+{-# OPTIONS_GHC -fno-warn-orphans #-}
17+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
18+
19+module Servant.ConnectionErrorSpec (spec) where
20+
21+import Prelude ()
22+import Prelude.Compat
23+
24+import Control.Exception
25+ (fromException)
26+import Data.Maybe
27+ (isJust)
28+import Data.Monoid ()
29+import Data.Proxy
30+import qualified Network.HTTP.Client as C
31+import Test.Hspec
32+
33+import Servant.API
34+ (Get, JSON)
35+import Servant.Client
36+import Servant.ClientTestUtils
37+
38+
39+spec :: Spec
40+spec = describe "Servant.ConnectionErrorSpec" $ do
41+ connectionErrorSpec
42+
43+type ConnectionErrorAPI = Get '[JSON] Int
44+
45+connectionErrorAPI :: Proxy ConnectionErrorAPI
46+connectionErrorAPI = Proxy
47+
48+connectionErrorSpec :: Spec
49+connectionErrorSpec = describe "Servant.Client.ClientError" $
50+ it "correctly catches ConnectionErrors when the HTTP request can't go through" $ do
51+ let getInt = client connectionErrorAPI
52+ let baseUrl' = BaseUrl Http "example.invalid" 80 ""
53+ let isHttpError (Left (ConnectionError e)) = isJust $ fromException @C.HttpException e
54+ isHttpError _ = False
55+ (isHttpError <$> runClient getInt baseUrl') `shouldReturn` True
servant-client/test/Servant/FailSpec.hsnew file+75
@@ -0,0 +1,75 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE FlexibleContexts #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE GADTs #-}
7+{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE OverloadedStrings #-}
9+{-# LANGUAGE PolyKinds #-}
10+{-# LANGUAGE ScopedTypeVariables #-}
11+{-# LANGUAGE TypeFamilies #-}
12+{-# LANGUAGE TypeOperators #-}
13+{-# LANGUAGE UndecidableInstances #-}
14+{-# OPTIONS_GHC -freduction-depth=100 #-}
15+{-# OPTIONS_GHC -fno-warn-orphans #-}
16+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
17+
18+module Servant.FailSpec (spec) where
19+
20+import Prelude ()
21+import Prelude.Compat
22+
23+import Data.Monoid ()
24+import Data.Semigroup
25+ ((<>))
26+import qualified Network.HTTP.Types as HTTP
27+import Test.Hspec
28+
29+import Servant.API
30+ ((:<|>) ((:<|>)))
31+import Servant.Client
32+import Servant.ClientTestUtils
33+
34+spec :: Spec
35+spec = describe "Servant.FailSpec" $ do
36+ failSpec
37+
38+failSpec :: Spec
39+failSpec = beforeAll (startWaiApp failServer) $ afterAll endWaiApp $ do
40+
41+ context "client returns errors appropriately" $ do
42+ it "reports FailureResponse" $ \(_, baseUrl) -> do
43+ let (_ :<|> _ :<|> getDeleteEmpty :<|> _) = client api
44+ Left res <- runClient getDeleteEmpty baseUrl
45+ case res of
46+ FailureResponse _ r | responseStatusCode r == HTTP.status404 -> return ()
47+ _ -> fail $ "expected 404 response, but got " <> show res
48+
49+ it "reports DecodeFailure" $ \(_, baseUrl) -> do
50+ let (_ :<|> _ :<|> _ :<|> getCapture :<|> _) = client api
51+ Left res <- runClient (getCapture "foo") baseUrl
52+ case res of
53+ DecodeFailure _ _ -> return ()
54+ _ -> fail $ "expected DecodeFailure, but got " <> show res
55+
56+ it "reports ConnectionError" $ \_ -> do
57+ let (getGetWrongHost :<|> _) = client api
58+ Left res <- runClient getGetWrongHost (BaseUrl Http "127.0.0.1" 19872 "")
59+ case res of
60+ ConnectionError _ -> return ()
61+ _ -> fail $ "expected ConnectionError, but got " <> show res
62+
63+ it "reports UnsupportedContentType" $ \(_, baseUrl) -> do
64+ let (_ :<|> getGet :<|> _ ) = client api
65+ Left res <- runClient getGet baseUrl
66+ case res of
67+ UnsupportedContentType "application/octet-stream" _ -> return ()
68+ _ -> fail $ "expected UnsupportedContentType, but got " <> show res
69+
70+ it "reports InvalidContentTypeHeader" $ \(_, baseUrl) -> do
71+ let (_ :<|> _ :<|> _ :<|> _ :<|> _ :<|> getBody :<|> _) = client api
72+ Left res <- runClient (getBody alice) baseUrl
73+ case res of
74+ InvalidContentTypeHeader _ -> return ()
75+ _ -> fail $ "expected InvalidContentTypeHeader, but got " <> show res
servant-client/test/Servant/GenAuthSpec.hsnew file+54
@@ -0,0 +1,54 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE FlexibleContexts #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE GADTs #-}
7+{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE OverloadedStrings #-}
9+{-# LANGUAGE PolyKinds #-}
10+{-# LANGUAGE ScopedTypeVariables #-}
11+{-# LANGUAGE TypeFamilies #-}
12+{-# LANGUAGE TypeOperators #-}
13+{-# LANGUAGE UndecidableInstances #-}
14+{-# OPTIONS_GHC -freduction-depth=100 #-}
15+{-# OPTIONS_GHC -fno-warn-orphans #-}
16+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
17+
18+module Servant.GenAuthSpec (spec) where
19+
20+import Prelude ()
21+import Prelude.Compat
22+
23+import Control.Arrow
24+ (left)
25+import Data.Monoid ()
26+import qualified Network.HTTP.Types as HTTP
27+import Test.Hspec
28+
29+import Servant.Client
30+import qualified Servant.Client.Core.Auth as Auth
31+import qualified Servant.Client.Core.Request as Req
32+import Servant.ClientTestUtils
33+
34+spec :: Spec
35+spec = describe "Servant.GenAuthSpec" $ do
36+ genAuthSpec
37+
38+genAuthSpec :: Spec
39+genAuthSpec = beforeAll (startWaiApp genAuthServer) $ afterAll endWaiApp $ do
40+ context "Authentication works when requests are properly authenticated" $ do
41+
42+ it "Authenticates a AuthProtect protected server appropriately" $ \(_, baseUrl) -> do
43+ let getProtected = client genAuthAPI
44+ let authRequest = Auth.mkAuthenticatedRequest () (\_ req -> Req.addHeader "AuthHeader" ("cool" :: String) req)
45+ left show <$> runClient (getProtected authRequest) baseUrl `shouldReturn` Right alice
46+
47+ context "Authentication is rejected when requests are not authenticated properly" $ do
48+
49+ it "Authenticates a AuthProtect protected server appropriately" $ \(_, baseUrl) -> do
50+ let getProtected = client genAuthAPI
51+ let authRequest = Auth.mkAuthenticatedRequest () (\_ req -> Req.addHeader "Wrong" ("header" :: String) req)
52+ Left (FailureResponse _ r) <- runClient (getProtected authRequest) baseUrl
53+ responseStatusCode r `shouldBe` HTTP.Status 401 "Unauthorized"
54+
servant-client/test/Servant/HoistClientSpec.hsnew file+58
@@ -0,0 +1,58 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE FlexibleContexts #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE GADTs #-}
7+{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE OverloadedStrings #-}
9+{-# LANGUAGE PolyKinds #-}
10+{-# LANGUAGE RecordWildCards #-}
11+{-# LANGUAGE ScopedTypeVariables #-}
12+{-# LANGUAGE TypeFamilies #-}
13+{-# LANGUAGE TypeOperators #-}
14+{-# LANGUAGE UndecidableInstances #-}
15+{-# OPTIONS_GHC -freduction-depth=100 #-}
16+{-# OPTIONS_GHC -fno-warn-orphans #-}
17+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
18+
19+module Servant.HoistClientSpec (spec) where
20+
21+import Prelude ()
22+import Prelude.Compat
23+
24+import Data.Monoid ()
25+import Data.Proxy
26+import Test.Hspec
27+
28+import Servant.API
29+ ((:<|>) ((:<|>)), (:>), Capture,
30+ Get, JSON, Post)
31+import Servant.Client
32+import Servant.Server
33+import Servant.ClientTestUtils
34+
35+
36+spec :: Spec
37+spec = describe "Servant.HoistClientSpec" $ do
38+ hoistClientSpec
39+
40+type HoistClientAPI = Get '[JSON] Int :<|> Capture "n" Int :> Post '[JSON] Int
41+
42+hoistClientAPI :: Proxy HoistClientAPI
43+hoistClientAPI = Proxy
44+
45+hoistClientServer :: Application -- implements HoistClientAPI
46+hoistClientServer = serve hoistClientAPI $ return 5 :<|> return
47+
48+hoistClientSpec :: Spec
49+hoistClientSpec = beforeAll (startWaiApp hoistClientServer) $ afterAll endWaiApp $ do
50+ describe "Servant.Client.hoistClient" $ do
51+ it "allows us to GET/POST/... requests in IO instead of ClientM" $ \(_, baseUrl) -> do
52+ let (getInt :<|> postInt)
53+ = hoistClient hoistClientAPI
54+ (fmap (either (error . show) id) . flip runClient baseUrl)
55+ (client hoistClientAPI)
56+
57+ getInt `shouldReturn` 5
58+ postInt 5 `shouldReturn` 5
servant-client/test/Servant/StreamSpec.hs+3−4
@@ -39,9 +39,6 @@ import Servant.API
3939 NewlineFraming, NoFraming, OctetStream, SourceIO, StreamGet,
4040 )
4141import Servant.Client.Streaming
42−import Servant.ClientSpec
43− (Person (..))
44−import qualified Servant.ClientSpec as CS
4542import Servant.Server
4643import Servant.Test.ComprehensiveAPI
4744import Servant.Types.SourceT
@@ -52,6 +49,8 @@ import System.IO.Unsafe
5249import System.Mem
5350 (performGC)
5451import Test.Hspec
52+import Servant.ClientTestUtils (Person(..))
53+import qualified Servant.ClientTestUtils as CT
5554
5655#if MIN_VERSION_base(4,10,0)
5756import GHC.Stats
@@ -120,7 +119,7 @@ testRunSourceIO :: SourceIO a
120119testRunSourceIO = runExceptT . runSourceT
121120
122121streamSpec :: Spec
123−streamSpec = beforeAll (CS.startWaiApp server) $ afterAll CS.endWaiApp $ do
122+streamSpec = beforeAll (CT.startWaiApp server) $ afterAll CT.endWaiApp $ do
124123 it "works with Servant.API.StreamGet.Newline" $ \(_, baseUrl) -> do
125124 withClient getGetNL baseUrl $ \(Right res) ->
126125 testRunSourceIO res `shouldReturn` Right [alice, bob, alice]
servant-client/test/Servant/SuccessSpec.hsnew file+140
@@ -0,0 +1,140 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE FlexibleContexts #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE GADTs #-}
7+{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE OverloadedStrings #-}
9+{-# LANGUAGE PolyKinds #-}
10+{-# LANGUAGE ScopedTypeVariables #-}
11+{-# LANGUAGE TypeFamilies #-}
12+{-# LANGUAGE TypeOperators #-}
13+{-# LANGUAGE UndecidableInstances #-}
14+{-# OPTIONS_GHC -freduction-depth=100 #-}
15+{-# OPTIONS_GHC -fno-warn-orphans #-}
16+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
17+
18+module Servant.SuccessSpec (spec) where
19+
20+import Prelude ()
21+import Prelude.Compat
22+
23+import Control.Arrow
24+ (left)
25+import Control.Concurrent.STM
26+ (atomically)
27+import Control.Concurrent.STM.TVar
28+ (newTVar, readTVar)
29+import Data.Foldable
30+ (forM_, toList)
31+import Data.Maybe
32+ (listToMaybe)
33+import Data.Monoid ()
34+import qualified Network.HTTP.Client as C
35+import qualified Network.HTTP.Types as HTTP
36+import Test.Hspec
37+import Test.Hspec.QuickCheck
38+import Test.HUnit
39+import Test.QuickCheck
40+
41+import Servant.API
42+ (NoContent (NoContent), getHeaders)
43+import Servant.Client
44+import qualified Servant.Client.Core.Request as Req
45+import Servant.Test.ComprehensiveAPI
46+import Servant.ClientTestUtils
47+
48+-- This declaration simply checks that all instances are in place.
49+_ = client comprehensiveAPIWithoutStreaming
50+
51+spec :: Spec
52+spec = describe "Servant.SuccessSpec" $ do
53+ successSpec
54+
55+successSpec :: Spec
56+successSpec = beforeAll (startWaiApp server) $ afterAll endWaiApp $ do
57+ it "Servant.API.Get root" $ \(_, baseUrl) -> do
58+ left show <$> runClient getRoot baseUrl `shouldReturn` Right carol
59+
60+ it "Servant.API.Get" $ \(_, baseUrl) -> do
61+ left show <$> runClient getGet baseUrl `shouldReturn` Right alice
62+
63+ describe "Servant.API.Delete" $ do
64+ it "allows empty content type" $ \(_, baseUrl) -> do
65+ left show <$> runClient getDeleteEmpty baseUrl `shouldReturn` Right NoContent
66+
67+ it "allows content type" $ \(_, baseUrl) -> do
68+ left show <$> runClient getDeleteContentType baseUrl `shouldReturn` Right NoContent
69+
70+ it "Servant.API.Capture" $ \(_, baseUrl) -> do
71+ left show <$> runClient (getCapture "Paula") baseUrl `shouldReturn` Right (Person "Paula" 0)
72+
73+ it "Servant.API.CaptureAll" $ \(_, baseUrl) -> do
74+ let expected = [Person "Paula" 0, Person "Peta" 1]
75+ left show <$> runClient (getCaptureAll ["Paula", "Peta"]) baseUrl `shouldReturn` Right expected
76+
77+ it "Servant.API.ReqBody" $ \(_, baseUrl) -> do
78+ let p = Person "Clara" 42
79+ left show <$> runClient (getBody p) baseUrl `shouldReturn` Right p
80+
81+ it "Servant.API FailureResponse" $ \(_, baseUrl) -> do
82+ left show <$> runClient (getQueryParam (Just "alice")) baseUrl `shouldReturn` Right alice
83+ Left (FailureResponse req _) <- runClient (getQueryParam (Just "bob")) baseUrl
84+ Req.requestPath req `shouldBe` (baseUrl, "/param")
85+ toList (Req.requestQueryString req) `shouldBe` [("name", Just "bob")]
86+ Req.requestMethod req `shouldBe` HTTP.methodGet
87+
88+ it "Servant.API.QueryParam" $ \(_, baseUrl) -> do
89+ left show <$> runClient (getQueryParam (Just "alice")) baseUrl `shouldReturn` Right alice
90+ Left (FailureResponse _ r) <- runClient (getQueryParam (Just "bob")) baseUrl
91+ responseStatusCode r `shouldBe` HTTP.Status 400 "bob not found"
92+
93+ it "Servant.API.QueryParam.QueryParams" $ \(_, baseUrl) -> do
94+ left show <$> runClient (getQueryParams []) baseUrl `shouldReturn` Right []
95+ left show <$> runClient (getQueryParams ["alice", "bob"]) baseUrl
96+ `shouldReturn` Right [Person "alice" 0, Person "bob" 1]
97+
98+ context "Servant.API.QueryParam.QueryFlag" $
99+ forM_ [False, True] $ \ flag -> it (show flag) $ \(_, baseUrl) -> do
100+ left show <$> runClient (getQueryFlag flag) baseUrl `shouldReturn` Right flag
101+
102+ it "Servant.API.Raw on success" $ \(_, baseUrl) -> do
103+ res <- runClient (getRawSuccess HTTP.methodGet) baseUrl
104+ case res of
105+ Left e -> assertFailure $ show e
106+ Right r -> do
107+ responseStatusCode r `shouldBe` HTTP.status200
108+ responseBody r `shouldBe` "rawSuccess"
109+
110+ it "Servant.API.Raw should return a Left in case of failure" $ \(_, baseUrl) -> do
111+ res <- runClient (getRawFailure HTTP.methodGet) baseUrl
112+ case res of
113+ Right _ -> assertFailure "expected Left, but got Right"
114+ Left (FailureResponse _ r) -> do
115+ responseStatusCode r `shouldBe` HTTP.status400
116+ responseBody r `shouldBe` "rawFailure"
117+ Left e -> assertFailure $ "expected FailureResponse, but got " ++ show e
118+
119+ it "Returns headers appropriately" $ \(_, baseUrl) -> do
120+ res <- runClient getRespHeaders baseUrl
121+ case res of
122+ Left e -> assertFailure $ show e
123+ Right val -> getHeaders val `shouldBe` [("X-Example1", "1729"), ("X-Example2", "eg2")]
124+
125+ it "Stores Cookie in CookieJar after a redirect" $ \(_, baseUrl) -> do
126+ mgr <- C.newManager C.defaultManagerSettings
127+ cj <- atomically . newTVar $ C.createCookieJar []
128+ _ <- runClientM (getRedirectWithCookie HTTP.methodGet) (ClientEnv mgr baseUrl (Just cj))
129+ cookie <- listToMaybe . C.destroyCookieJar <$> atomically (readTVar cj)
130+ C.cookie_name <$> cookie `shouldBe` Just "testcookie"
131+ C.cookie_value <$> cookie `shouldBe` Just "test"
132+
133+ modifyMaxSuccess (const 20) $ do
134+ it "works for a combination of Capture, QueryParam, QueryFlag and ReqBody" $ \(_, baseUrl) ->
135+ property $ forAllShrink pathGen shrink $ \(NonEmpty cap) num flag body ->
136+ ioProperty $ do
137+ result <- left show <$> runClient (getMultiple cap num flag body) baseUrl
138+ return $
139+ result === Right (cap, num, flag, body)
140+
servant-client/test/Servant/WrappedApiSpec.hsnew file+63
@@ -0,0 +1,63 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE FlexibleContexts #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE GADTs #-}
7+{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE OverloadedStrings #-}
9+{-# LANGUAGE PolyKinds #-}
10+{-# LANGUAGE ScopedTypeVariables #-}
11+{-# LANGUAGE TypeFamilies #-}
12+{-# LANGUAGE TypeOperators #-}
13+{-# LANGUAGE UndecidableInstances #-}
14+{-# OPTIONS_GHC -freduction-depth=100 #-}
15+{-# OPTIONS_GHC -fno-warn-orphans #-}
16+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
17+
18+module Servant.WrappedApiSpec (spec) where
19+
20+import Prelude ()
21+import Prelude.Compat
22+
23+import Control.Exception
24+ (bracket)
25+import Control.Monad.Error.Class
26+ (throwError)
27+import Data.Monoid ()
28+import Data.Proxy
29+import qualified Network.HTTP.Types as HTTP
30+import Test.Hspec
31+
32+import Servant.API
33+ (Delete, Get, JSON, Post, Put)
34+import Servant.Client
35+import Servant.Server
36+import Servant.ClientTestUtils
37+
38+spec :: Spec
39+spec = describe "Servant.WrappedApiSpec" $ do
40+ wrappedApiSpec
41+
42+data WrappedApi where
43+ WrappedApi :: (HasServer (api :: *) '[], Server api ~ Handler a,
44+ HasClient ClientM api, Client ClientM api ~ ClientM ()) =>
45+ Proxy api -> WrappedApi
46+
47+wrappedApiSpec :: Spec
48+wrappedApiSpec = describe "error status codes" $ do
49+ let serveW api = serve api $ throwError $ ServerError 500 "error message" "" []
50+ context "are correctly handled by the client" $
51+ let test :: (WrappedApi, String) -> Spec
52+ test (WrappedApi api, desc) =
53+ it desc $ bracket (startWaiApp $ serveW api) endWaiApp $ \(_, baseUrl) -> do
54+ let getResponse :: ClientM ()
55+ getResponse = client api
56+ Left (FailureResponse _ r) <- runClient getResponse baseUrl
57+ responseStatusCode r `shouldBe` HTTP.Status 500 "error message"
58+ in mapM_ test $
59+ (WrappedApi (Proxy :: Proxy (Delete '[JSON] ())), "Delete") :
60+ (WrappedApi (Proxy :: Proxy (Get '[JSON] ())), "Get") :
61+ (WrappedApi (Proxy :: Proxy (Post '[JSON] ())), "Post") :
62+ (WrappedApi (Proxy :: Proxy (Put '[JSON] ())), "Put") :
63+ []