@@ -26,12 +26,10 @@ module Servant.ClientSpec where
2626import Control.Applicative ((<$>))
2727#endif
2828import Control.Arrow (left)
29−import Control.Concurrent (forkIO, killThread, newEmptyMVar,
30− putMVar, readMVar)
31−import Control.Exception (bracket, finally)
29+import Control.Concurrent (forkIO, killThread, ThreadId)
30+import Control.Exception (bracket)
3231import Control.Monad.Trans.Except (ExceptT, runExceptT, throwE)
3332import Data.Aeson
34−import Data.Char
3533import Data.Char (chr, isPrint)
3634import Data.Foldable (forM_)
3735import Data.Monoid hiding (getLast)
@@ -41,9 +39,8 @@ import GHC.Generics (Generic)
4139import GHC.TypeLits
4240import qualified Network.HTTP.Client as C
4341import Network.HTTP.Media
44−import Network.HTTP.Types (Method, Status (..), badRequest400,
45− methodGet, ok200)
46−import qualified Network.HTTP.Types as HTTP
42+import Network.HTTP.Types (Status (..), badRequest400,
43+ methodGet, ok200, status400)
4744import Network.Socket
4845import Network.Wai (Application, responseLBS)
4946import Network.Wai.Handler.Warp
@@ -194,7 +191,8 @@ sucessSpec = beforeAll (startWaiApp server) $ afterAll endWaiApp $ do
194191 let getQueryFlag = getNth (Proxy :: Proxy 6) $ client api baseUrl manager
195192 (left show <$> runExceptT (getQueryFlag flag)) `shouldReturn` Right flag
196193
197− it "Servant.API.Raw on success" $ do
194+ it "Servant.API.Raw on success" $ \(_, baseUrl) -> do
195+ let getRawSuccess = getNth (Proxy :: Proxy 7) $ client api baseUrl manager
198196 res <- runExceptT (getRawSuccess methodGet)
199197 case res of
200198 Left e -> assertFailure $ show e
@@ -204,7 +202,7 @@ sucessSpec = beforeAll (startWaiApp server) $ afterAll endWaiApp $ do
204202 C.responseStatus response `shouldBe` ok200
205203
206204 it "Servant.API.Raw should return a Left in case of failure" $ \(_, baseUrl) -> do
207− let getRawFailure = getNth (Proxy :: Proxy 11) $ client api baseUrl manager
205+ let getRawFailure = getNth (Proxy :: Proxy 8) $ client api baseUrl manager
208206 res <- runExceptT (getRawFailure methodGet)
209207 case res of
210208 Right _ -> assertFailure "expected Left, but got Right"
@@ -213,7 +211,7 @@ sucessSpec = beforeAll (startWaiApp server) $ afterAll endWaiApp $ do
213211 Servant.Client.responseBody e `shouldBe` "rawFailure"
214212
215213 it "Returns headers appropriately" $ \(_, baseUrl) -> do
216− let getRespHeaders = getNth (Proxy :: Proxy 13) $ client api baseUrl manager
214+ let getRespHeaders = getNth (Proxy :: Proxy 10) $ client api baseUrl manager
217215 res <- runExceptT getRespHeaders
218216 case res of
219217 Left e -> assertFailure $ show e
@@ -221,7 +219,7 @@ sucessSpec = beforeAll (startWaiApp server) $ afterAll endWaiApp $ do
221219
222220 modifyMaxSuccess (const 20) $ do
223221 it "works for a combination of Capture, QueryParam, QueryFlag and ReqBody" $ \(_, baseUrl) ->
224− let getMultiple = getNth (Proxy :: Proxy 12) $ client api baseUrl manager
222+ let getMultiple = getNth (Proxy :: Proxy 9) $ client api baseUrl manager
225223 in property $ forAllShrink pathGen shrink $ \(NonEmpty cap) num flag body ->
226224 ioProperty $ do
227225 result <- left show <$> runExceptT (getMultiple cap num flag body)