git.iko.soy/servant-quickcheck
on master help sign in
Support for servant-0.12
commit3571f543fdd2b1dcc81c124e57934ef127a469ec authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 7 Nov 2017, 14:51 (9 years ago) parentd65abc8
4 files changed+28−53
compare with master
unifiedsplit
CHANGELOG.yaml+7 servant-quickcheck.cabal+13−9 src/Servant/QuickCheck/Internal/HasGenRequest.hs+8 test/Doctest.hs−44
CHANGELOG.yaml+7
@@ -1,6 +1,13 @@
11upcoming:
22
33releases:
4+ - version: "0.0.4"
5+ changes:
6+
7+ - description: Support for Servant 0.12
8+ issue: none
9+ authors: phadej
10+ date: 2017-11-07
411
512 - version: "0.0.3.1"
613 changes:
servant-quickcheck.cabal+13−9
@@ -1,5 +1,5 @@
11name: servant-quickcheck
2−version: 0.0.3.1
2+version: 0.0.4
33synopsis: QuickCheck entire APIs
44description:
55 This packages provides QuickCheck properties that are tested across an entire
@@ -14,6 +14,10 @@ build-type: Simple
1414cabal-version: >=1.10
1515extra-source-files:
1616 CHANGELOG.yaml
17+tested-with:
18+ GHC==7.10.3,
19+ GHC==8.0.2,
20+ GHC==8.2.1
1721
1822source-repository head
1923 type: git
@@ -31,7 +35,7 @@ library
3135 , Servant.QuickCheck.Internal.QuickCheck
3236 , Servant.QuickCheck.Internal.Equality
3337 , Servant.QuickCheck.Internal.ErrorTypes
34− build-depends: base >=4.8 && <4.10
38+ build-depends: base >=4.8 && <4.11
3539 , base-compat == 0.9.*
3640 , aeson > 0.8 && < 2
3741 , bytestring == 0.10.*
@@ -40,20 +44,20 @@ library
4044 , data-default-class >= 0.0 && < 0.2
4145 , hspec >= 2.2 && < 2.5
4246 , http-client >= 0.4.30 && < 0.6
43− , http-media == 0.6.*
44− , http-types > 0.8 && < 0.10
47+ , http-media >= 0.6 && <0.8
48+ , http-types > 0.8 && < 0.11
4549 , mtl > 2.1 && < 2.3
4650 , pretty == 1.1.*
47− , process >= 1.2 && < 1.5
51+ , process >= 1.2 && < 1.7
4852 , QuickCheck > 2.7 && < 2.11
49− , servant > 0.6 && < 0.12
50− , servant-client > 0.6 && < 0.12
51− , servant-server > 0.6 && < 0.12
53+ , servant > 0.6 && < 0.13
54+ , servant-client > 0.6 && < 0.13
55+ , servant-server > 0.6 && < 0.13
5256 , split == 0.2.*
5357 , string-conversions > 0.3 && < 0.5
5458 , temporary == 1.2.*
5559 , text == 1.*
56− , time >= 1.5 && < 1.7
60+ , time >= 1.5 && < 1.9
5761 , warp >= 3.2.4 && < 3.3
5862
5963 hs-source-dirs: src
src/Servant/QuickCheck/Internal/HasGenRequest.hs+8
@@ -69,6 +69,14 @@ instance HasGenRequest EmptyAPI where
6969 genRequest _ = (0, error "EmptyAPIs cannot be queried.")
7070#endif
7171
72+#if MIN_VERSION_servant(0,12,0)
73+instance HasGenRequest api => HasGenRequest (Summary d :> api) where
74+ genRequest _ = genRequest (Proxy :: Proxy api)
75+
76+instance HasGenRequest api => HasGenRequest (Description d :> api) where
77+ genRequest _ = genRequest (Proxy :: Proxy api)
78+#endif
79+
7280instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
7381 => HasGenRequest (Capture x c :> b) where
7482 genRequest _ = (oldf, do
test/Doctest.hsdeleted−44
@@ -1,44 +0,0 @@
1−module Main where
2−
3−import Data.List (isPrefixOf)
4−import System.Directory
5−import System.FilePath
6−import System.FilePath.Find
7−import Test.DocTest
8−
9−main :: IO ()
10−main = do
11− files <- find always (extension ==? ".hs") "src"
12− mCabalMacrosFile <- getCabalMacrosFile
13− doctest $ "-isrc" : "-Iinclude" :
14− (maybe [] (\ f -> ["-optP-include", "-optP" ++ f]) mCabalMacrosFile) ++
15− "-XOverloadedStrings" :
16− "-XDeriveFunctor" :
17− "-XFlexibleInstances" :
18− "-XFlexibleContexts" :
19− "-XMultiParamTypeClasses" :
20− "-XDataKinds" :
21− "-XTypeOperators" :
22− "-XGADTs" :
23− files
24−
25−getCabalMacrosFile :: IO (Maybe FilePath)
26−getCabalMacrosFile = do
27− exists <- doesDirectoryExist "dist"
28− if exists
29− then do
30− contents <- getDirectoryContents "dist"
31− let rest = "build" </> "autogen" </> "cabal_macros.h"
32− whenExists $ case filter ("dist-sandbox-" `isPrefixOf`) contents of
33− [x] -> "dist" </> x </> rest
34− [] -> "dist" </> rest
35− xs -> error $ "ran doctests with multiple dist/dist-sandbox-xxxxx's: \n"
36− ++ show xs ++ "\nTry cabal clean"
37− else return Nothing
38− where
39− whenExists :: FilePath -> IO (Maybe FilePath)
40− whenExists file = do
41− exists <- doesFileExist file
42− return $ if exists
43− then Just file
44− else Nothing