4765664 · servant-quickcheck

git.iko.soy/servant-quickcheck

Merge pull request #32 from adinapoli-iohk/support-servant-0.11

Tentatively support Servant 0.11

commit4765664a3ea730dee97ecf89ba25f9f451576184 authorJulian Arni <jkarni@gmail.com> dateThu 19 Oct 2017, 10:11 (9 years ago) parentfb14b3c 199f6cc

6 files changed+23−4

compare with master

unifiedsplit

.travis.yml+1 CHANGELOG.yaml+9 servant-quickcheck.cabal+3−3 src/Servant/QuickCheck/Internal/HasGenRequest.hs+4 stack-lts-9.yaml+6 test/Servant/QuickCheck/InternalSpec.hs−1

.travis.yml+1

@@ -6,6 +6,7 @@ env:

66 - STACK_YAML=stack.yaml

77 - STACK_YAML=stack-lts-7.yaml

88 - STACK_YAML=stack-lts-6.yaml

9+ - STACK_YAML=stack-lts-9.yaml

910

1011

1112addons:

CHANGELOG.yaml+9

@@ -2,6 +2,15 @@ upcoming:

33releases:

5+ - version: "0.0.3.1"

6+ changes:

8+ - description: Support for Servant 0.11

9+ issue: none

10+ pr: 32

11+ authors: adinapoli-iohk

12+ date: 2017-10-18

13+

514 - version: "0.0.3.0"

615 changes:

716

servant-quickcheck.cabal+3−3

@@ -46,9 +46,9 @@ library

4646 , pretty == 1.1.*

4747 , process >= 1.2 && < 1.5

4848 , QuickCheck > 2.7 && < 2.11

49− , servant > 0.6 && < 0.10

50− , servant-client > 0.6 && < 0.10

51− , servant-server > 0.6 && < 0.10

49+ , servant > 0.6 && < 0.12

50+ , servant-client > 0.6 && < 0.12

51+ , servant-server > 0.6 && < 0.12

5252 , split == 0.2.*

5353 , string-conversions > 0.3 && < 0.5

5454 , temporary == 1.2.*

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

@@ -64,6 +64,10 @@ instance (KnownSymbol path, HasGenRequest b) => HasGenRequest (path :> b) where

6464 (oldf, old) = genRequest (Proxy :: Proxy b)

6565 new = cs $ symbolVal (Proxy :: Proxy path)

6666

67+#if MIN_VERSION_servant(0,11,0)

68+instance HasGenRequest EmptyAPI where

69+ genRequest _ = (0, error "EmptyAPIs cannot be queried.")

70+#endif

6771

6872instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )

6973 => 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

3838import Servant.QuickCheck.Internal (genRequest, runGenRequest,

3939 serverDoesntSatisfy)

4040

41−

4241spec :: Spec

4342spec = do

4443 serversEqualSpec