git.iko.soy/servant-quickcheck
on master help sign in
Merge pull request #32 from adinapoli-iohk/support-servant-0.11
4765664Julian Arni
.travis.yml+1
compare with master
unifiedsplit
@@ -6,6 +6,7 @@ env:
6 - STACK_YAML=stack.yaml
6 - STACK_YAML=stack.yaml
7 - STACK_YAML=stack-lts-7.yaml
7 - STACK_YAML=stack-lts-7.yaml
8 - STACK_YAML=stack-lts-6.yaml
8 - STACK_YAML=stack-lts-6.yaml
9+ - STACK_YAML=stack-lts-9.yaml
9
10
10
11
11addons:
12addons:
CHANGELOG.yaml+9
@@ -2,6 +2,15 @@ upcoming:
2
2
3releases:
3releases:
4
4
5+ - version: "0.0.3.1"
6+ changes:
7+
8+ - description: Support for Servant 0.11
9+ issue: none
10+ pr: 32
11+ authors: adinapoli-iohk
12+ date: 2017-10-18
13+
5 - version: "0.0.3.0"
14 - version: "0.0.3.0"
6 changes:
15 changes:
7
16
servant-quickcheck.cabal+3−3
@@ -46,9 +46,9 @@ library
46 , pretty == 1.1.*
46 , pretty == 1.1.*
47 , process >= 1.2 && < 1.5
47 , process >= 1.2 && < 1.5
48 , QuickCheck > 2.7 && < 2.11
48 , QuickCheck > 2.7 && < 2.11
49− , servant > 0.6 && < 0.10
49+ , servant > 0.6 && < 0.12
50− , servant-client > 0.6 && < 0.10
50+ , servant-client > 0.6 && < 0.12
51− , servant-server > 0.6 && < 0.10
51+ , servant-server > 0.6 && < 0.12
52 , split == 0.2.*
52 , split == 0.2.*
53 , string-conversions > 0.3 && < 0.5
53 , string-conversions > 0.3 && < 0.5
54 , temporary == 1.2.*
54 , temporary == 1.2.*
src/Servant/QuickCheck/Internal/HasGenRequest.hs+4
@@ -64,6 +64,10 @@ instance (KnownSymbol path, HasGenRequest b) => HasGenRequest (path :> b) where
64 (oldf, old) = genRequest (Proxy :: Proxy b)
64 (oldf, old) = genRequest (Proxy :: Proxy b)
65 new = cs $ symbolVal (Proxy :: Proxy path)
65 new = cs $ symbolVal (Proxy :: Proxy path)
66
66
67+#if MIN_VERSION_servant(0,11,0)
68+instance HasGenRequest EmptyAPI where
69+ genRequest _ = (0, error "EmptyAPIs cannot be queried.")
70+#endif
67
71
68instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
72instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
69 => HasGenRequest (Capture x c :> b) where
73 => HasGenRequest (Capture x c :> b) where
stack-lts-9.yamlnew file+6
@@ -0,0 +1,6 @@
1+resolver: lts-9.1
2+packages:
3+- '.'
4+extra-deps: []
5+flags: {}
6+extra-package-dbs: []
test/Servant/QuickCheck/InternalSpec.hs−1
@@ -38,7 +38,6 @@ import Servant.QuickCheck
38import Servant.QuickCheck.Internal (genRequest, runGenRequest,
38import Servant.QuickCheck.Internal (genRequest, runGenRequest,
39 serverDoesntSatisfy)
39 serverDoesntSatisfy)
40
40
41−
42spec :: Spec
41spec :: Spec
43spec = do
42spec = do
44 serversEqualSpec
43 serversEqualSpec