eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rebase master and cleanup

Browse source
This commit is contained in:
Brandon Martin 2015-11-17 14:22:39 -07:00
parent 09c397d41d
commit b17f2dd0e8
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servant-client/test/Servant/ClientSpec.hs
View file

@ -41,7 +41,7 @@ import qualified Network.HTTP.Client as C
import Network.HTTP.Media
import Network.HTTP.Types (Status (..), badRequest400,
methodGet, ok200, status400)
import Network.Socket
import Network.Socket hiding (Raw)
import Network.Wai (Application, responseLBS)
import Network.Wai.Handler.Warp
import System.IO.Unsafe (unsafePerformIO)
@ -98,8 +98,8 @@ type Api =
:<|> "param" :> QueryParam "name" String :> Get '[FormUrlEncoded,JSON] Person
:<|> "params" :> QueryParams "names" String :> Get '[JSON] [Person]
:<|> "flag" :> QueryFlag "flag" :> Get '[JSON] Bool
:<|> "rawSuccess" :> Raw
:<|> "rawFailure" :> Raw
:<|> "rawSuccess" :> Raw IO Application
:<|> "rawFailure" :> Raw IO Application
:<|> "multiple" :>
Capture "first" String :>
QueryParam "second" Int :>

4
servant-foreign/src/Servant/Foreign.hs
View file

@ -239,8 +239,8 @@ instance (KnownSymbol sym, HasForeign sublayout)
where str = pack . symbolVal $ (Proxy :: Proxy sym)
instance HasForeign Raw where
type Foreign Raw = Method -> Req
instance HasForeign (Raw m a) where
type Foreign (Raw m a) = Method -> Req
foreignFor Proxy req method =
req & funcName %~ ((toLower method) :)

2
servant-server/test/Servant/ServerSpec.hs
View file

@ -38,7 +38,7 @@ import Servant.API ((:<|>) (..), (:>), Capture, Delete,
HttpVersion, IsSecure (..), JSON,
Patch, PlainText, Post, Put,
QueryFlag, QueryParam, QueryParams,
Raw, RemoteHost, ReqBody,
Raw(..), RemoteHost, ReqBody,
addHeader)
import Servant.Server (Server, serve, ServantErr(..), err404)
import Test.Hspec (Spec, describe, it, shouldBe)