From 2109326ad7ec3dc7743b8db9c43d2af6c2122254 Mon Sep 17 00:00:00 2001
From: Nick B <nick@declension.net>
Date: Fri, 10 Mar 2017 08:31:56 +0000
Subject: [PATCH] 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`)
---
 src/Servant/QuickCheck/Internal/HasGenRequest.hs | 6 ++----
 test/Servant/QuickCheck/InternalSpec.hs          | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Servant/QuickCheck/Internal/HasGenRequest.hs b/src/Servant/QuickCheck/Internal/HasGenRequest.hs
index 378f743..010842f 100644
--- a/src/Servant/QuickCheck/Internal/HasGenRequest.hs
+++ b/src/Servant/QuickCheck/Internal/HasGenRequest.hs
@@ -15,9 +15,8 @@ import Servant
 import Servant.API.ContentTypes (AllMimeRender (..))
 import Servant.Client           (BaseUrl (..), Scheme (..))
 import Test.QuickCheck          (Arbitrary (..), Gen, elements, oneof)
-#if MIN_VERSION_servant(0,8,0)
+
 import qualified Data.ByteString as BS
-#endif
 
 
 class HasGenRequest a where
@@ -120,9 +119,8 @@ instance (KnownSymbol x, HasGenRequest b)
     genRequest _ = do
       old' <- old
       return $ \burl -> let r = old' burl
-                            newExpr = param <> "="
                             qs = queryString r in r {
-          queryString = if BS.null qs then newExpr else newExpr <> "&" <> qs }
+          queryString = if BS.null qs then param else param <> "&" <> qs }
       where
         old = genRequest (Proxy :: Proxy b)
         param = cs $ symbolVal (Proxy :: Proxy x)
diff --git a/test/Servant/QuickCheck/InternalSpec.hs b/test/Servant/QuickCheck/InternalSpec.hs
index 98a3843..0e6c053 100644
--- a/test/Servant/QuickCheck/InternalSpec.hs
+++ b/test/Servant/QuickCheck/InternalSpec.hs
@@ -133,7 +133,7 @@ queryFlagsSpec = describe "QueryFlags" $ do
         gen = genRequest flagsAPI
         req = (unGen gen rng 0) burl
         qs = C.unpack $ queryString req
-    qs `shouldBe` "one=&two="
+    qs `shouldBe` "one&two"
 
 ------------------------------------------------------------------------------
 -- APIs