git.iko.soy/servant-quickcheck
on e3bf044 help sign in
0535413
swap
0 ahead, 29 behind
10 files changed+241−342
since splitsnapshots
unifiedsplit
.travis.yml+85−127 CHANGELOG.yaml−42 cabal.haskell-ci−7 cabal.project−4 servant-quickcheck.cabal+112−114 src/Servant/QuickCheck/Internal/HasGenRequest.hs+6−9 src/Servant/QuickCheck/Internal/Predicates.hs+15−14 src/Servant/QuickCheck/Internal/QuickCheck.hs+2−18 stack.yaml+9−5 test/Servant/QuickCheck/InternalSpec.hs+12−2
.travis.yml+85−127
@@ -1,158 +1,116 @@
11# This Travis job script has been generated by a script via
22#
3−# haskell-ci '--config=cabal.haskell-ci' 'servant-quickcheck.cabal'
3+# runghc make_travis_yml_2.hs '--branch' 'master' '-o' '.travis.yml' 'servant-quickcheck.cabal'
44#
5−# To regenerate the script (for example after adjusting tested-with) run
5+# For more information, see https://github.com/hvr/multi-ghc-travis
66#
7−# haskell-ci regenerate
8−#
9−# For more information, see https://github.com/haskell-CI/haskell-ci
10−#
11−# version: 0.10.1
12−#
13−version: ~> 1.0
147language: c
15−os: linux
16−dist: xenial
8+sudo: false
9+
1710git:
18− # whether to recursively clone submodules
19− submodules: false
11+ submodules: false # whether to recursively clone submodules
12+
2013branches:
2114 only:
2215 - master
16+
2317cache:
2418 directories:
2519 - $HOME/.cabal/packages
2620 - $HOME/.cabal/store
27− - $HOME/.hlint
21+
2822before_cache:
29− - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
23+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
3024 # remove files that are regenerated by 'cabal update'
31− - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
32− - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
33− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
34− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
35− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
36− - rm -rfv $CABALHOME/packages/head.hackage
37−jobs:
25+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
26+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
27+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
28+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
29+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
30+
31+ - rm -rfv $HOME/.cabal/packages/head.hackage
32+
33+matrix:
3834 include:
39− - compiler: ghc-8.8.3
40− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.3","cabal-install-3.2"]}}
41− os: linux
42− - compiler: ghc-8.6.5
43− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.2"]}}
44− os: linux
45− - compiler: ghc-8.4.4
46− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.2"]}}
47− os: linux
48− - compiler: ghc-8.2.2
49− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.2"]}}
50− os: linux
51− - compiler: ghc-8.0.2
52− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.2"]}}
53− os: linux
35+ - compiler: "ghc-8.4.3"
36+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
37+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
38+ - compiler: "ghc-8.2.2"
39+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
40+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
41+ - compiler: "ghc-8.0.2"
42+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
43+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
44+ - compiler: "ghc-7.10.3"
45+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
46+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
47+
5448before_install:
55− - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
56− - WITHCOMPILER="-w $HC"
57− - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
58− - HCPKG="$HC-pkg"
49+ - HC=${CC}
50+ - HCPKG=${HC/ghc/ghc-pkg}
5951 - unset CC
60− - CABAL=/opt/ghc/bin/cabal
61− - CABALHOME=$HOME/.cabal
62− - export PATH="$CABALHOME/bin:$PATH"
63− - TOP=$(pwd)
64− - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
52+ - ROOTDIR=$(pwd)
53+ - mkdir -p $HOME/.local/bin
54+ - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
55+ - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
6556 - echo $HCNUMVER
66− - CABAL="$CABAL -vnormal+nowrap"
67− - set -o pipefail
68− - TEST=--enable-tests
69− - BENCH=--enable-benchmarks
70− - HEADHACKAGE=false
71− - rm -f $CABALHOME/config
72− - |
73− echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
74− echo "remote-build-reporting: anonymous" >> $CABALHOME/config
75− echo "write-ghc-environment-files: always" >> $CABALHOME/config
76− echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
77− echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
78− echo "world-file: $CABALHOME/world" >> $CABALHOME/config
79− echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
80− echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
81− echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
82− echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
83− echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
84− echo "install-dirs user" >> $CABALHOME/config
85− echo " prefix: $CABALHOME" >> $CABALHOME/config
86− echo "repository hackage.haskell.org" >> $CABALHOME/config
87− echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
57+
8858install:
89− - ${CABAL} --version
59+ - cabal --version
9060 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
91− - |
92− echo "program-default-options" >> $CABALHOME/config
93− echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
94− - cat $CABALHOME/config
95− - rm -fv cabal.project cabal.project.local cabal.project.freeze
96− - travis_retry ${CABAL} v2-update -v
97− # Generate cabal.project
98− - rm -rf cabal.project cabal.project.local cabal.project.freeze
99− - touch cabal.project
100− - |
101− echo "packages: ." >> cabal.project
102− - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-quickcheck' >> cabal.project ; fi
103− - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
104− - |
105− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-quickcheck)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
61+ - BENCH=${BENCH---enable-benchmarks}
62+ - TEST=${TEST---enable-tests}
63+ - HADDOCK=${HADDOCK-true}
64+ - UNCONSTRAINED=${UNCONSTRAINED-true}
65+ - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
66+ - GHCHEAD=${GHCHEAD-false}
67+ - travis_retry cabal update -v
68+ - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
69+ - rm -fv cabal.project cabal.project.local
70+ - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
71+ - "printf 'packages: \".\"\\n' > cabal.project"
72+ - touch cabal.project.local
73+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
10674 - cat cabal.project || true
10775 - cat cabal.project.local || true
108− - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
109− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
110− - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
111− - rm cabal.project.freeze
112− - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
113− - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
114−script:
76+ - if [ -f "./configure.ac" ]; then
77+ (cd "." && autoreconf -i);
78+ fi
79+ - rm -f cabal.project.freeze
80+ - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
81+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
82+ - rm -rf .ghc.environment.* "."/dist
11583 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
116− # Packaging...
117− - ${CABAL} v2-sdist all
118− # Unpacking...
119− - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
84+
85+# Here starts the actual work to be performed for the package under test;
86+# any command which exits with a non-zero exit code causes the build to fail.
87+script:
88+ # test that source-distributions can be generated
89+ - (cd "." && cabal sdist)
90+ - mv "."/dist/servant-quickcheck-*.tar.gz ${DISTDIR}/
12091 - cd ${DISTDIR} || false
121− - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
122− - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
123− - PKGDIR_servant_quickcheck="$(find . -maxdepth 1 -type d -regex '.*/servant-quickcheck-[0-9.]*')"
124− # Generate cabal.project
125− - rm -rf cabal.project cabal.project.local cabal.project.freeze
126− - touch cabal.project
127− - |
128− echo "packages: ${PKGDIR_servant_quickcheck}" >> cabal.project
129− - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-quickcheck' >> cabal.project ; fi
130− - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
131− - |
132− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-quickcheck)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
92+ - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
93+ - "printf 'packages: servant-quickcheck-*/*.cabal\\n' > cabal.project"
94+ - touch cabal.project.local
95+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
13396 - cat cabal.project || true
13497 - cat cabal.project.local || true
135− # Building...
13698 # this builds all libraries and executables (without tests/benchmarks)
137− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
138− # Building with tests and benchmarks...
99+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
100+
139101 # build & run tests, build benchmarks
140− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
141− # Testing...
142− - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
143− # cabal check...
144− - (cd ${PKGDIR_servant_quickcheck} && ${CABAL} -vnormal check)
145− # haddock...
146− - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
147− # Building without installed constraints for packages in global-db...
148− - rm -f cabal.project.local
149− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
150− # Constraint sets
151− - rm -rf cabal.project.local
152− # Constraint set base-compat-0.10
153− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.10.*' all
154− # Constraint set base-compat-0.11
155− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all
102+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all
103+ - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
104+
105+ # cabal check
106+ - (cd servant-quickcheck-* && cabal check)
107+
108+ # haddock
109+ - rm -rf ./dist-newstyle
110+ - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
111+
112+ # Build without installed constraints for packages in global-db
113+ - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi
156114
157−# REGENDATA ("0.10.1",["--config=cabal.haskell-ci","servant-quickcheck.cabal"])
115+# REGENDATA ["--branch","master","-o",".travis.yml","servant-quickcheck.cabal"]
158116# EOF
CHANGELOG.yaml−42
@@ -1,46 +1,4 @@
11releases:
2− - version: "0.0.9.0"
3− changes:
4− - description: "Support servant-0.15 (#65)"
5− authors: fizruk
6− date: 2020-06-25
7−
8− - description: "Relax constraints for GHC 8.10 (#70)"
9− authors: felixmulder
10− date: 2020-06-20
11−
12− - version: "0.0.8.0"
13− changes:
14− - description: Support for servant-0.17
15− authors: phadej
16− date: 2019-01-23
17−
18− - version: "0.0.7.3"
19− changes:
20− - description: Support for servant-0.14
21− issue: 53
22− authors: phadej
23− date: 2018-06-12
24−
25− - description: Fix a failure from OnlyJsonObjects when there is no content-type.
26− issue: 55
27− authors: Phenitei
28− date: 2018-08-27
29−
30− - description: A bug fix where notAllowedContainsAllowHeader would print the initial request alongside the failure instead of the request causing the failure when it failed.
31− issue: 57
32− authors: Phenitei
33− date: 2018-08-29
34−
35− - description: QuickCheck 2.12 compatibility
36− issue: 58
37− authors: parsonsmatt
38− date: 2018-10-12
39−
40− - description: GHC 8.6 compatibility
41− issue: 59
42− authors: phadej
43− date: 2018-10-15
442
453 - version: "0.0.7.2"
464 changes:
cabal.haskell-cideleted−7
@@ -1,7 +0,0 @@
1−branches: master
2−
3−constraint-set base-compat-0.10
4− constraints: base-compat ==0.10.*
5−
6−constraint-set base-compat-0.11
7− constraints: base-compat ==0.11.*
cabal.projectdeleted−4
@@ -1,4 +0,0 @@
1−packages: .
2−tests: true
3−
4−allow-newer: servant-blaze:servant
servant-quickcheck.cabal+112−114
@@ -1,22 +1,28 @@
1−name: servant-quickcheck
2−version: 0.0.9.1
3−synopsis: QuickCheck entire APIs
1+name: servant-quickcheck
2+version: 0.0.7.2
3+x-revision: 1
4+synopsis: QuickCheck entire APIs
45description:
5− This packages provides QuickCheck properties that are tested across an entire
6− API.
6+ This packages provides QuickCheck properties that are tested across an entire
7+ API.
78
8−license: BSD3
9−license-file: LICENSE
10−author: Julian K. Arni
11−maintainer: jkarni@gmail.com
12−category: Web
13−build-type: Simple
14−cabal-version: >=1.10
15−extra-source-files: CHANGELOG.yaml
16−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || == 8.8.3
9+license: BSD3
10+license-file: LICENSE
11+author: Julian K. Arni
12+maintainer: jkarni@gmail.com
13+category: Web
14+build-type: Simple
15+cabal-version: >=1.10
16+extra-source-files:
17+ CHANGELOG.yaml
18+tested-with:
19+ GHC==7.10.3,
20+ GHC==8.0.2,
21+ GHC==8.2.2,
22+ GHC==8.4.3
1723
1824source-repository head
19− type: git
25+ type: git
2026 location: https://github.com/haskell-servant/servant-quickcheck
2127
2228flag long-tests
@@ -24,115 +30,107 @@ flag long-tests
2430 default: False
2531
2632library
27− exposed-modules:
28− Servant.QuickCheck
29− Servant.QuickCheck.Internal
30− Servant.QuickCheck.Internal.Equality
31− Servant.QuickCheck.Internal.ErrorTypes
32− Servant.QuickCheck.Internal.HasGenRequest
33− Servant.QuickCheck.Internal.Predicates
34− Servant.QuickCheck.Internal.QuickCheck
33+ exposed-modules: Servant.QuickCheck
34+ , Servant.QuickCheck.Internal
35+ , Servant.QuickCheck.Internal.Predicates
36+ , Servant.QuickCheck.Internal.HasGenRequest
37+ , Servant.QuickCheck.Internal.QuickCheck
38+ , Servant.QuickCheck.Internal.Equality
39+ , Servant.QuickCheck.Internal.ErrorTypes
40+ build-depends: base >=4.8 && <4.12
41+ , base-compat-batteries >= 0.10.1 && <0.11
42+ , aeson > 0.8 && < 2
43+ , bytestring == 0.10.*
44+ , case-insensitive == 1.2.*
45+ , clock >= 0.7 && < 0.8
46+ , data-default-class >= 0.0 && < 0.2
47+ , hspec >= 2.5 && < 2.6
48+ , http-client >= 0.4.30 && < 0.6
49+ , http-media >= 0.6 && <0.8
50+ , http-types > 0.8 && < 0.13
51+ , mtl > 2.1 && < 2.3
52+ , pretty == 1.1.*
53+ , process >= 1.2 && < 1.7
54+ , QuickCheck > 2.7 && < 2.12
55+ , servant >= 0.13 && < 0.15
56+ , servant-client >= 0.13 && < 0.15
57+ , servant-server >= 0.13 && < 0.15
58+ , split == 0.2.*
59+ , string-conversions > 0.3 && < 0.5
60+ , temporary >= 1.2 && <1.4
61+ , text == 1.*
62+ , time >= 1.5 && < 1.9
63+ , warp >= 3.2.4 && < 3.3
3564
36− build-depends:
37− aeson >=0.8 && <2
38− , base >=4.9 && <4.15
39− , base-compat-batteries >=0.10.1 && <0.12
40− , bytestring >=0.10 && <0.11
41− , case-insensitive >=1.2 && <1.3
42− , clock >=0.7 && <0.9
43− , data-default-class >=0.0 && <0.2
44− , hspec >=2.5.6 && <2.8
45− , http-client >=0.4.30 && <0.8
46− , http-media >=0.6 && <0.9
47− , http-types >=0.8 && <0.13
48− , mtl >=2.1 && <2.3
49− , pretty >=1.1 && <1.2
50− , process >=1.2 && <1.7
51− , QuickCheck >=2.7 && <2.15
52− , servant >=0.17 && <0.19
53− , servant-client >=0.17 && <0.19
54− , servant-server >=0.17 && <0.19
55− , split >=0.2 && <0.3
56− , string-conversions >=0.3 && <0.5
57− , temporary >=1.2 && <1.4
58− , text >=1 && <2
59− , time >=1.5 && <1.11
60− , warp >=3.2.4 && <3.4
61−
62− if !impl(ghc >=8.0)
63− build-depends: semigroups >=0.18.3 && <0.20
64−
65− hs-source-dirs: src
66− default-extensions:
67− NoImplicitPrelude
68− ConstraintKinds
69− DataKinds
70− DeriveDataTypeable
71− DeriveFunctor
72− DeriveGeneric
73− FlexibleContexts
74− FlexibleInstances
75− FunctionalDependencies
76− GADTs
77− KindSignatures
78− MultiParamTypeClasses
79− OverloadedStrings
80− RankNTypes
81− ScopedTypeVariables
82− TypeOperators
65+ if !impl(ghc >= 8.0)
66+ build-depends:
67+ semigroups >= 0.18.3 && <0.19
8368
84− default-language: Haskell2010
69+ hs-source-dirs: src
70+ default-extensions: TypeOperators
71+ , FlexibleInstances
72+ , FlexibleContexts
73+ , DataKinds
74+ , GADTs
75+ , MultiParamTypeClasses
76+ , DeriveFunctor
77+ , KindSignatures
78+ , RankNTypes
79+ , ConstraintKinds
80+ , DeriveGeneric
81+ , ScopedTypeVariables
82+ , OverloadedStrings
83+ , FunctionalDependencies
84+ , NoImplicitPrelude
85+ , DeriveDataTypeable
86+ default-language: Haskell2010
8587
8688test-suite spec
87− type: exitcode-stdio-1.0
88− ghc-options: -Wall -threaded
89− default-language: Haskell2010
90− hs-source-dirs: test
91− main-is: Spec.hs
92− other-modules: Servant.QuickCheck.InternalSpec
93− build-tool-depends: hspec-discover:hspec-discover -any
94− build-depends:
95− aeson
96− , base
97− , base-compat-batteries
98− , blaze-html
99− , bytestring
100− , hspec
101− , hspec-core >=2.5.5 && <2.8
102− , http-client
103− , QuickCheck
104− , quickcheck-io
105− , servant
106− , servant-blaze
107− , servant-client
108− , servant-quickcheck
109− , servant-server
110− , transformers
111− , warp
112−
113− default-extensions:
114− NoImplicitPrelude
115− DataKinds
116− FlexibleContexts
117− FlexibleInstances
118− GADTs
119− OverloadedStrings
120− ScopedTypeVariables
121− TypeOperators
122−
89+ type: exitcode-stdio-1.0
90+ ghc-options: -Wall -threaded
91+ default-language: Haskell2010
92+ hs-source-dirs: test
93+ main-is: Spec.hs
94+ other-modules: Servant.QuickCheck.InternalSpec
95+ build-tool-depends: hspec-discover:hspec-discover
96+ build-depends: base
97+ , base-compat-batteries
98+ , aeson
99+ , servant-quickcheck
100+ , bytestring
101+ , hspec
102+ , hspec-core
103+ , http-client
104+ , blaze-html
105+ , warp
106+ , servant-server
107+ , servant-client
108+ , servant
109+ , servant-blaze
110+ , transformers
111+ , QuickCheck
112+ , quickcheck-io
113+ default-extensions: TypeOperators
114+ , FlexibleInstances
115+ , FlexibleContexts
116+ , GADTs
117+ , DataKinds
118+ , NoImplicitPrelude
119+ , OverloadedStrings
120+ , ScopedTypeVariables
123121 if flag(long-tests)
124− cpp-options: -DLONG_TESTS
122+ cpp-options: -DLONG_TESTS
125123
126124test-suite example
127− type: exitcode-stdio-1.0
128− main-is: Main.hs
129− hs-source-dirs: example
130− ghc-options: -Wall
125+ type: exitcode-stdio-1.0
126+ main-is: Main.hs
127+ hs-source-dirs:
128+ example
129+ ghc-options: -Wall
131130 build-depends:
132131 base
133132 , hspec
134− , servant-quickcheck
135133 , servant-server
134+ , servant-quickcheck
136135 , text
137−
138136 default-language: Haskell2010
src/Servant/QuickCheck/Internal/HasGenRequest.hs+6−9
@@ -63,14 +63,18 @@ instance (KnownSymbol path, HasGenRequest b) => HasGenRequest (path :> b) where
6363 (oldf, old) = genRequest (Proxy :: Proxy b)
6464 new = cs $ symbolVal (Proxy :: Proxy path)
6565
66+#if MIN_VERSION_servant(0,11,0)
6667instance HasGenRequest EmptyAPI where
6768 genRequest _ = (0, error "EmptyAPIs cannot be queried.")
69+#endif
6870
71+#if MIN_VERSION_servant(0,12,0)
6972instance HasGenRequest api => HasGenRequest (Summary d :> api) where
7073 genRequest _ = genRequest (Proxy :: Proxy api)
7174
7275instance HasGenRequest api => HasGenRequest (Description d :> api) where
7376 genRequest _ = genRequest (Proxy :: Proxy api)
77+#endif
7478
7579instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
7680 => HasGenRequest (Capture' mods x c :> b) where
@@ -82,6 +86,7 @@ instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
8286 (oldf, old) = genRequest (Proxy :: Proxy b)
8387 new = arbitrary :: Gen c
8488
89+#if MIN_VERSION_servant(0,8,0)
8590instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
8691 => HasGenRequest (CaptureAll x c :> b) where
8792 genRequest _ = (oldf, do
@@ -92,6 +97,7 @@ instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
9297 where
9398 (oldf, old) = genRequest (Proxy :: Proxy b)
9499 new = arbitrary :: Gen [c]
100+#endif
95101
96102instance (Arbitrary c, KnownSymbol h, HasGenRequest b, ToHttpApiData c)
97103 => HasGenRequest (Header' mods h c :> b) where
@@ -168,15 +174,6 @@ instance (ReflectMethod method)
168174 , method = reflectMethod (Proxy :: Proxy method)
169175 })
170176
171−instance (ReflectMethod method)
172− => HasGenRequest (NoContentVerb (method :: k)) where
173− genRequest _ = (1, return $ \burl -> defaultRequest
174− { host = cs $ baseUrlHost burl
175− , port = baseUrlPort burl
176− , secure = baseUrlScheme burl == Https
177− , method = reflectMethod (Proxy :: Proxy method)
178− })
179−
180177instance (HasGenRequest a) => HasGenRequest (RemoteHost :> a) where
181178 genRequest _ = genRequest (Proxy :: Proxy a)
182179
src/Servant/QuickCheck/Internal/Predicates.hs+15−14
@@ -84,13 +84,15 @@ notLongerThan maxAllowed
8484-- /Since 0.0.0.0/
8585onlyJsonObjects :: ResponsePredicate
8686onlyJsonObjects
87− = ResponsePredicate (\resp -> do
88− case lookup "content-type" (first foldedCase <$> responseHeaders resp) of
89− Nothing -> return ()
90− Just ctype -> when ("application/json" `SBS.isPrefixOf` ctype) $ do
91− case (decode (responseBody resp) :: Maybe Object) of
92− Nothing -> throw $ PredicateFailure "onlyJsonObjects" Nothing resp
93− Just _ -> return ())
87+ = ResponsePredicate (\resp -> case go resp of
88+ Nothing -> throw $ PredicateFailure "onlyJsonObjects" Nothing resp
89+ Just () -> return ())
90+ where
91+ go r = do
92+ ctyp <- lookup "content-type" (first foldedCase <$> responseHeaders r)
93+ when ("application/json" `SBS.isPrefixOf` ctyp) $ do
94+ (_ :: Object) <- decode (responseBody r)
95+ return ()
9496
9597-- | __Optional__
9698--
@@ -187,15 +189,14 @@ getsHaveLastModifiedHeader
187189notAllowedContainsAllowHeader :: RequestPredicate
188190notAllowedContainsAllowHeader
189191 = RequestPredicate $ \req mgr -> do
190− let reqs = [ req { method = renderStdMethod m } | m <- [minBound .. maxBound]
191− , renderStdMethod m /= method req ]
192− resp <- mapM (flip httpLbs mgr) reqs
193−
194− case filter pred' (zip reqs resp) of
195− (x:_) -> throw $ PredicateFailure "notAllowedContainsAllowHeader" (Just $ fst x) (snd x)
192+ resp <- mapM (flip httpLbs mgr) $ [ req { method = renderStdMethod m }
193+ | m <- [minBound .. maxBound ]
194+ , renderStdMethod m /= method req ]
195+ case filter pred' resp of
196+ (x:_) -> throw $ PredicateFailure "notAllowedContainsAllowHeader" (Just req) x
196197 [] -> return resp
197198 where
198− pred' (_, resp) = responseStatus resp == status405 && not (hasValidHeader "Allow" go resp)
199+ pred' resp = responseStatus resp == status405 && not (hasValidHeader "Allow" go resp)
199200 where
200201 go x = all (\y -> isRight $ parseMethod $ SBSC.pack y)
201202 $ wordsBy (`elem` (", " :: [Char])) (SBSC.unpack x)
src/Servant/QuickCheck/Internal/QuickCheck.hs+2−18
@@ -11,9 +11,6 @@ import Network.Wai.Handler.Warp (withApplication)
1111import Prelude.Compat
1212import Servant (Context (EmptyContext), HasServer,
1313 Server, serveWithContext)
14−#if MIN_VERSION_servant_server(0,18,0)
15−import Servant (DefaultErrorFormatters, ErrorFormatters, HasContextEntry, type (.++))
16−#endif
1714import Servant.Client (BaseUrl (..), Scheme (..))
1815import System.IO.Unsafe (unsafePerformIO)
1916import Test.Hspec (Expectation, expectationFailure)
@@ -40,11 +37,7 @@ withServantServer api = withServantServerAndContext api EmptyContext
4037-- application.
4138--
4239-- /Since 0.0.0.0/
43−#if MIN_VERSION_servant_server(0,18,0)
44−withServantServerAndContext :: (HasServer a ctx, HasContextEntry (ctx .++ DefaultErrorFormatters) ErrorFormatters)
45−#else
4640withServantServerAndContext :: HasServer a ctx
47−#endif
4841 => Proxy a -> Context ctx -> IO (Server a) -> (BaseUrl -> IO r) -> IO r
4942withServantServerAndContext api ctx server t
5043 = withApplication (return . serveWithContext api ctx =<< server) $ \port ->
@@ -99,10 +92,7 @@ serversEqual api burl1 burl2 args req = do
9992 expectationFailure $ "We failed to record a reason for failure: " <> show r
10093 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
10194 NoExpectedFailure {} -> expectationFailure "No expected failure"
102−#if MIN_VERSION_QuickCheck(2,12,0)
103−#else
10495 InsufficientCoverage {} -> expectationFailure "Insufficient coverage"
105−#endif
10696
10797-- | Check that a server satisfies the set of properties specified.
10898--
@@ -155,10 +145,7 @@ serverSatisfiesMgr api manager burl args preds = do
155145 expectationFailure $ "We failed to record a reason for failure: " <> show r
156146 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
157147 NoExpectedFailure {} -> expectationFailure $ "No expected failure"
158−#if MIN_VERSION_QuickCheck(2,12,0)
159−#else
160− InsufficientCoverage {} -> expectationFailure "Insufficient coverage"
161−#endif
148+ InsufficientCoverage {} -> expectationFailure $ "Insufficient coverage"
162149
163150serverDoesntSatisfy :: (HasGenRequest a) =>
164151 Proxy a -> BaseUrl -> Args -> Predicates -> Expectation
@@ -176,10 +163,7 @@ serverDoesntSatisfyMgr api manager burl args preds = do
176163 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
177164 Failure { output = m } -> expectationFailure $ "Failed:\n" ++ show m
178165 NoExpectedFailure {} -> expectationFailure $ "No expected failure"
179−#if MIN_VERSION_QuickCheck(2,12,0)
180−#else
181− InsufficientCoverage {} -> expectationFailure "Insufficient coverage"
182−#endif
166+ InsufficientCoverage {} -> expectationFailure $ "Insufficient coverage"
183167
184168noCheckStatus :: C.Request -> C.Request
185169#if MIN_VERSION_http_client(0,5,0)
stack.yaml+9−5
@@ -1,10 +1,14 @@
1−resolver: nightly-2018-09-03
1+resolver: lts-11.8
22packages:
33- '.'
44extra-deps:
5−- hspec-discover-2.5.6
6−- hspec-core-2.5.6
7−- hspec-2.5.6
8−- QuickCheck-2.12
5+- base-compat-batteries-0.10.1
6+- base-compat-0.10.1
7+- hspec-discover-2.5.0
8+- hspec-core-2.5.0
9+- hspec-2.5.0
10+# aeson pre-1.3.1.0 has an upper bound on `base-compat-batteries` that preclude
11+# the 0.10.1 that we depend on
12+- aeson-1.3.1.0
913flags: {}
1014extra-package-dbs: []
test/Servant/QuickCheck/InternalSpec.hs+12−2
@@ -23,7 +23,12 @@ import Test.QuickCheck.Gen (generate, unGen)
2323import Test.QuickCheck.Random (mkQCGen)
2424
2525
26−import Servant.Test.ComprehensiveAPI (comprehensiveAPIWithoutStreamingOrRaw)
26+#if MIN_VERSION_servant(0,8,0)
27+import Servant.API.Internal.Test.ComprehensiveAPI (comprehensiveAPIWithoutRaw)
28+#else
29+import Servant.API.Internal.Test.ComprehensiveAPI (ComprehensiveAPI,
30+ comprehensiveAPI)
31+#endif
2732
2833import Servant.QuickCheck
2934import Servant.QuickCheck.Internal (genRequest, runGenRequest,
@@ -149,7 +154,7 @@ isComprehensiveSpec :: Spec
149154isComprehensiveSpec = describe "HasGenRequest" $ do
150155
151156 it "has instances for all 'servant' combinators" $ do
152− let _g = genRequest comprehensiveAPIWithoutStreamingOrRaw
157+ let _g = genRequest comprehensiveAPIWithoutRaw
153158 True `shouldBe` True -- This is a type-level check
154159
155160deepPathSpec :: Spec
@@ -369,3 +374,8 @@ noOfTestCases = 20000
369374#else
370375noOfTestCases = 1000
371376#endif
377+
378+#if !MIN_VERSION_servant(0,8,0)
379+comprehensiveAPIWithoutRaw :: Proxy ComprehensiveAPI
380+comprehensiveAPIWithoutRaw = comprehensiveAPI
381+#endif