haskell/servant-quickcheck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QueryParams: fix ampersand, improve test

Browse Source 
* Simplify test API to use `()` - no awkward values at all.
 * The test asserts on _entire_ of resulting path now...
 * ...and fix the ampersand placement, but preserving the order of params left to right. The code also reads a bit better this way...
This commit is contained in:
Nick B 2017-03-07 21:25:11 +00:00
parent a5224276d5
commit 6be6697165
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Servant/QuickCheck/Internal/HasGenRequest.hs
View File

@ -92,8 +92,9 @@ instance (KnownSymbol x, Arbitrary c, ToHttpApiData c, HasGenRequest b)
new' <- new new' <- new
old' <- old old' <- old
return $ \burl -> let r = old' burl return $ \burl -> let r = old' burl
newExpr = param <> "=" <> cs (toQueryParam new')
qs = queryString r in r { qs = queryString r in r {
queryString = (if BS.null qs then "" else "&") <> qs <> param <> "=" <> cs (toQueryParam new') } queryString = if BS.null qs then newExpr else newExpr <> "&" <> qs }
where where
old = genRequest (Proxy :: Proxy b) old = genRequest (Proxy :: Proxy b)
param = cs $ symbolVal (Proxy :: Proxy x) param = cs $ symbolVal (Proxy :: Proxy x)

7
test/Servant/QuickCheck/InternalSpec.hs
View File

@ -4,7 +4,7 @@ module Servant.QuickCheck.InternalSpec (spec) where
import Control.Concurrent.MVar (newMVar, readMVar, swapMVar) import Control.Concurrent.MVar (newMVar, readMVar, swapMVar)
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import qualified Data.ByteString.Char8 as C import qualified Data.ByteString.Char8 as C
import Prelude.Compat import Prelude.Compat
import Servant import Servant
import Test.Hspec (Spec, context, describe, it, shouldBe, import Test.Hspec (Spec, context, describe, it, shouldBe,
@ -121,8 +121,7 @@ queryParamsSpec = describe "QueryParams" $ do
gen = genRequest paramsAPI gen = genRequest paramsAPI
req = (unGen gen rng 0) burl req = (unGen gen rng 0) burl
qs = C.unpack $ queryString req qs = C.unpack $ queryString req
qs `shouldContain` ("one=") qs `shouldBe` "one=&two="
qs `shouldContain` ("&two=")
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- APIs -- APIs
@ -135,7 +134,7 @@ type API = ReqBody '[JSON] String :> Post '[JSON] String
api :: Proxy API api :: Proxy API
api = Proxy api = Proxy
type ParamsAPI = QueryParam "one" String :> QueryParam "two" String :> Get '[JSON] String type ParamsAPI = QueryParam "one" String :> QueryParam "two" String :> Get '[JSON] ()
paramsAPI :: Proxy ParamsAPI paramsAPI :: Proxy ParamsAPI
paramsAPI = Proxy paramsAPI = Proxy