2109326 · servant-quickcheck

git.iko.soy/servant-quickcheck

QueryFlags don't use =

* Also, fix import for old `Servant` versions - _every_ version now needs `Data.Bytestring` (i.e. Servant version < 0.8, as per old lts in `stack.yaml`)

commit2109326ad7ec3dc7743b8db9c43d2af6c2122254 authorNick B <nick@declension.net> dateFri 10 Mar 2017, 08:31 (10 years ago) parent77fa490

2 files changed+3−5

compare with master

unifiedsplit

src/Servant/QuickCheck/Internal/HasGenRequest.hs+2−4 test/Servant/QuickCheck/InternalSpec.hs+1−1

src/Servant/QuickCheck/Internal/HasGenRequest.hs+2−4

@@ -15,9 +15,8 @@ import Servant

1515import Servant.API.ContentTypes (AllMimeRender (..))

1616import Servant.Client (BaseUrl (..), Scheme (..))

1717import Test.QuickCheck (Arbitrary (..), Gen, elements, oneof)

18−#if MIN_VERSION_servant(0,8,0)

18+

1919import qualified Data.ByteString as BS

20−#endif

2120

2221

2322class HasGenRequest a where

@@ -120,9 +119,8 @@ instance (KnownSymbol x, HasGenRequest b)

120119 genRequest _ = do

121120 old' <- old

122121 return $ \burl -> let r = old' burl

123− newExpr = param <> "="

124122 qs = queryString r in r {

125− queryString = if BS.null qs then newExpr else newExpr <> "&" <> qs }

123+ queryString = if BS.null qs then param else param <> "&" <> qs }

126124 where

127125 old = genRequest (Proxy :: Proxy b)

128126 param = cs $ symbolVal (Proxy :: Proxy x)

test/Servant/QuickCheck/InternalSpec.hs+1−1

@@ -133,7 +133,7 @@ queryFlagsSpec = describe "QueryFlags" $ do

133133 gen = genRequest flagsAPI

134134 req = (unGen gen rng 0) burl

135135 qs = C.unpack $ queryString req

136− qs `shouldBe` "one=&two="

136+ qs `shouldBe` "one&two"

137137

138138------------------------------------------------------------------------------

139139-- APIs