git.iko.soy/servant-quickcheck
on 6be6697 help sign in
0535413
swap
0 ahead, 82 behind
.travis.yml+21−153
since splitsnapshots
unifiedsplit
@@ -1,158 +1,26 @@
1−# This Travis job script has been generated by a script via
1+sudo: false
2−#
2+
3−# haskell-ci '--config=cabal.haskell-ci' 'servant-quickcheck.cabal'
4−#
5−# To regenerate the script (for example after adjusting tested-with) run
6−#
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
14language: c
3language: c
15−os: linux
4+
16−dist: xenial
5+matrix:
17−git:
18− # whether to recursively clone submodules
19− submodules: false
20−branches:
21− only:
22− - master
23−cache:
24− directories:
25− - $HOME/.cabal/packages
26− - $HOME/.cabal/store
27− - $HOME/.hlint
28−before_cache:
29− - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
30− # 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:
38 include:
6 include:
39− - compiler: ghc-8.8.3
7+ - env: CABALVER=1.22 GHCVER=7.10.1
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"]}}
8+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1],sources: [hvr-ghc]}}
41− os: linux
9+ - env: CABALVER=1.24 GHCVER=8.0.1
42− - compiler: ghc-8.6.5
10+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
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"]}}
11+
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
54−before_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"
59− - 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))')"
65− - 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
88install:
12install:
89− - ${CABAL} --version
13+ - (mkdir -p $HOME/.local/bin && cd $HOME/.local/bin && wget https://zalora-public.s3.amazonaws.com/tinc && chmod +x tinc)
90− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
14+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
91− - |
15+ - ghc --version
92− echo "program-default-options" >> $CABALHOME/config
16+ - cabal --version
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
17+ - travis_retry cabal update
97− # Generate cabal.project
18+ - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
98− - rm -rf cabal.project cabal.project.local cabal.project.freeze
19+
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"
106− - cat cabal.project || true
107− - 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
114script:
20script:
115− - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
21+ - tinc && cabal configure --enable-tests && cabal build && cabal test
116− # Packaging...
22+ - cabal check
117− - ${CABAL} v2-sdist all
118− # Unpacking...
119− - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
120− - 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"
133− - cat cabal.project || true
134− - cat cabal.project.local || true
135− # Building...
136− # 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...
139− # 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
156
23
157−# REGENDATA ("0.10.1",["--config=cabal.haskell-ci","servant-quickcheck.cabal"])
24+cache:
158−# EOF
25+ directories:
26+ - $HOME/.tinc/cache
CHANGELOG.yaml+2−139
@@ -1,143 +1,6 @@
1−releases:
1+upcoming:
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
44−
45− - version: "0.0.7.2"
46− changes:
47−
48− - description: Allow client to pass an HTTP Manager in to functions
49− issue: 47
50− authors: parsonsmatt
51− date: 2018-05-10
52−
53− - description: Fix "should not happen" error when exceptions are thrown
54− issue: 48
55− authors: parsonsmatt
56− date: 2018-05-10
57−
58− - version: "0.0.7.0"
59− changes:
60−
61− - description: Support for base-compat-0.10
62− issue: none
63− authors: phadej
64− date: 2018-04-12
65−
66− - version: "0.0.7.0"
67− changes:
68−
69− - description: Support for GHC-8.4.1
70− issue: none
71− authors: phadej
72− date: 2018-03-23
73−
74− - description: Requires hspec-2.5
75− issue: none
76− authors: phadej
77− date: 2018-03-23
78−
79− - version: "0.0.6.0"
80− changes:
81
2
82− - description: Support for servant-0.12
3+releases:
83− issue: none
84− authors: phadej
85− date: 2018-02-09
86−
87− - version: "0.0.5.0"
88− changes:
89−
90− - description: Export forgotten predicates
91− issue: none
92− pr: 40
93− authors: Phenitei
94− date: 2017-12-14
95−
96− - version: "0.0.4"
97− changes:
98−
99− - description: Support for Servant 0.12
100− issue: none
101− authors: phadej
102− date: 2017-11-07
103−
104− - description: Support for Servant 0.11
105− issue: none
106− pr: 32
107− authors: adinapoli-iohk
108− date: 2017-10-18
109− notes: Includes 0-weighted instance for EmptyAPI
110−
111− - version: "0.0.3.0"
112− changes:
113−
114− - description: Add jsonEquality
115− issue: 2
116− pr: 30
117− authors: erewok
118− date: 2017-10-15
119−
120− - description: Support hspec >= 2.4
121− issue: 27
122− pr: 29
123− authors: erewok, jkarni
124− date: 2017-10-15
125−
126− - version: "0.0.2.4"
127− changes:
128−
129− - description: Don't append slashes to paths
130− issue: 22
131− authors: declension
132− date: 2017-03-11
133−
134− - version: "0.0.2.3"
135− changes:
136−
137− - description: Fix QueryParam and QueryFlag requests
138− issue: 23
139− authors: declension
140− date: 2017-03-10
141
4
142 - version: "0.0.2.2"
5 - version: "0.0.2.2"
143 changes:
6 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
example/Main.hsdeleted−31
@@ -1,31 +0,0 @@
1−{-# LANGUAGE OverloadedStrings, DataKinds #-}
2−module Main (main) where
3−
4−import Servant
5−import Servant.QuickCheck
6−import Test.Hspec
7−import Data.Text (Text)
8−import System.Environment (getArgs)
9−
10−main :: IO ()
11−main = do
12− args <- getArgs
13− case args of
14− [] -> putStrLn "Not running without arguments. Try --help or --fail-fast."
15− _ -> hspec spec
16−
17−-- Change to String to reproduce
18−-- https://github.com/haskell-servant/servant-quickcheck/issues/41
19−type API = Get '[PlainText] Text
20−
21−api :: Proxy API
22−api = Proxy
23−
24−server :: Server API
25−server = return "Sigurð Fáfnirslayer"
26−
27−spec :: Spec
28−spec = describe "example server" $
29− it "mangles UTF-8 in error messages" $
30− withServantServer api (return server) $ \burl ->
31− serverSatisfies api burl defaultArgs (getsHaveCacheControlHeader <%> mempty)
servant-quickcheck.cabal+93−123
@@ -1,22 +1,22 @@
1−name: servant-quickcheck
1+name: servant-quickcheck
2−version: 0.0.9.1
2+version: 0.0.2.2
3−synopsis: QuickCheck entire APIs
3+synopsis: QuickCheck entire APIs
4description:
4description:
5− This packages provides QuickCheck properties that are tested across an entire
5+ This packages provides QuickCheck properties that are tested across an entire
6− API.
6+ API.
7
7
8−license: BSD3
8+license: BSD3
9−license-file: LICENSE
9+license-file: LICENSE
10−author: Julian K. Arni
10+author: Julian K. Arni
11−maintainer: jkarni@gmail.com
11+maintainer: jkarni@gmail.com
12−category: Web
12+category: Web
13−build-type: Simple
13+build-type: Simple
14−cabal-version: >=1.10
14+cabal-version: >=1.10
15−extra-source-files: CHANGELOG.yaml
15+extra-source-files:
16−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || == 8.8.3
16+ CHANGELOG.yaml
17
17
18source-repository head
18source-repository head
19− type: git
19+ type: git
20 location: https://github.com/haskell-servant/servant-quickcheck
20 location: https://github.com/haskell-servant/servant-quickcheck
21
21
22flag long-tests
22flag long-tests
@@ -24,115 +24,85 @@ flag long-tests
24 default: False
24 default: False
25
25
26library
26library
27− exposed-modules:
27+ exposed-modules: Servant.QuickCheck
28+ , Servant.QuickCheck.Internal
29+ , Servant.QuickCheck.Internal.Predicates
28− Servant.QuickCheck
30+ , Servant.QuickCheck.Internal.HasGenRequest
29− Servant.QuickCheck.Internal
31+ , Servant.QuickCheck.Internal.QuickCheck
30− Servant.QuickCheck.Internal.Equality
32+ , Servant.QuickCheck.Internal.Equality
31− Servant.QuickCheck.Internal.ErrorTypes
33+ , Servant.QuickCheck.Internal.ErrorTypes
32− Servant.QuickCheck.Internal.HasGenRequest
34+ build-depends: base >=4.8 && <4.10
33− Servant.QuickCheck.Internal.Predicates
35+ , base-compat == 0.9.*
34− Servant.QuickCheck.Internal.QuickCheck
36+ , aeson > 0.8 && < 2
37+ , bytestring == 0.10.*
38+ , case-insensitive == 1.2.*
39+ , clock >= 0.7 && < 0.8
40+ , data-default-class >= 0.0 && < 0.2
41+ , hspec == 2.2.*
42+ , http-client >= 0.4.30 && < 0.6
43+ , http-media == 0.6.*
44+ , http-types > 0.8 && < 0.10
45+ , mtl > 2.1 && < 2.3
46+ , pretty == 1.1.*
47+ , process >= 1.2 && < 1.5
48+ , QuickCheck > 2.7 && < 2.10
49+ , servant > 0.6 && < 0.10
50+ , servant-client > 0.6 && < 0.10
51+ , servant-server > 0.6 && < 0.10
52+ , split == 0.2.*
53+ , string-conversions > 0.3 && < 0.5
54+ , temporary == 1.2.*
55+ , text == 1.*
56+ , time >= 1.5 && < 1.7
57+ , warp >= 3.2.4 && < 3.3
35
58
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
59+ hs-source-dirs: src
66− default-extensions:
60+ default-extensions: TypeOperators
67− NoImplicitPrelude
61+ , FlexibleInstances
68− ConstraintKinds
62+ , FlexibleContexts
69− DataKinds
63+ , DataKinds
70− DeriveDataTypeable
64+ , GADTs
65+ , MultiParamTypeClasses
71− DeriveFunctor
66+ , DeriveFunctor
72− DeriveGeneric
73− FlexibleContexts
74− FlexibleInstances
75− FunctionalDependencies
76− GADTs
77− KindSignatures
67+ , KindSignatures
78− MultiParamTypeClasses
79− OverloadedStrings
80− RankNTypes
68+ , RankNTypes
69+ , ConstraintKinds
70+ , DeriveGeneric
81− ScopedTypeVariables
71+ , ScopedTypeVariables
82− TypeOperators
72+ , OverloadedStrings
83−
73+ , FunctionalDependencies
74+ , NoImplicitPrelude
75+ , DeriveDataTypeable
84− default-language: Haskell2010
76+ default-language: Haskell2010
85
77
86test-suite spec
78test-suite spec
87− type: exitcode-stdio-1.0
79+ type: exitcode-stdio-1.0
88− ghc-options: -Wall -threaded
80+ ghc-options: -Wall -threaded
89− default-language: Haskell2010
81+ default-language: Haskell2010
90− hs-source-dirs: test
82+ hs-source-dirs: test
91− main-is: Spec.hs
83+ main-is: Spec.hs
92− other-modules: Servant.QuickCheck.InternalSpec
84+ other-modules: Servant.QuickCheck.InternalSpec
93− build-tool-depends: hspec-discover:hspec-discover -any
85+ build-depends: base == 4.*
94− build-depends:
95− aeson
96− , base
97− , base-compat-batteries
86+ , base-compat
98− , blaze-html
87+ , servant-quickcheck
99− , bytestring
88+ , bytestring
100− , hspec
89+ , hspec
101− , hspec-core >=2.5.5 && <2.8
90+ , hspec-core
102− , http-client
91+ , http-client
103− , QuickCheck
92+ , warp
104− , quickcheck-io
105− , servant
106− , servant-blaze
107− , servant-client
108− , servant-quickcheck
109− , servant-server
93+ , servant-server
94+ , servant-client
95+ , servant
110− , transformers
96+ , transformers
111− , warp
97+ , QuickCheck
112−
98+ , quickcheck-io
113− default-extensions:
99+ default-extensions: TypeOperators
114− NoImplicitPrelude
115− DataKinds
116− FlexibleContexts
117− FlexibleInstances
100+ , FlexibleInstances
101+ , FlexibleContexts
118− GADTs
102+ , GADTs
103+ , DataKinds
104+ , NoImplicitPrelude
119− OverloadedStrings
105+ , OverloadedStrings
120− ScopedTypeVariables
106+ , ScopedTypeVariables
121− TypeOperators
122−
123 if flag(long-tests)
107 if flag(long-tests)
124− cpp-options: -DLONG_TESTS
108+ cpp-options: -DLONG_TESTS
125−
126−test-suite example
127− type: exitcode-stdio-1.0
128− main-is: Main.hs
129− hs-source-dirs: example
130− ghc-options: -Wall
131− build-depends:
132− base
133− , hspec
134− , servant-quickcheck
135− , servant-server
136− , text
137−
138− default-language: Haskell2010
src/Servant/QuickCheck.hs−6
@@ -29,16 +29,11 @@ module Servant.QuickCheck
29 , not500
29 , not500
30 , notLongerThan
30 , notLongerThan
31 , onlyJsonObjects
31 , onlyJsonObjects
32− , honoursAcceptHeader
33 , notAllowedContainsAllowHeader
32 , notAllowedContainsAllowHeader
34 , unauthorizedContainsWWWAuthenticate
33 , unauthorizedContainsWWWAuthenticate
35− , getsHaveLastModifiedHeader
36 , getsHaveCacheControlHeader
34 , getsHaveCacheControlHeader
37 , headsHaveCacheControlHeader
35 , headsHaveCacheControlHeader
38 , createContainsValidLocation
36 , createContainsValidLocation
39− -- * Html Predicates
40− , htmlIncludesDoctype
41−
42 -- *** Predicate utilities and types
37 -- *** Predicate utilities and types
43 , (<%>)
38 , (<%>)
44 , Predicates
39 , Predicates
@@ -54,7 +49,6 @@ module Servant.QuickCheck
54 -- represents other means of checking equality
49 -- represents other means of checking equality
55 -- *** Useful @ResponseEquality@s
50 -- *** Useful @ResponseEquality@s
56 , bodyEquality
51 , bodyEquality
57− , jsonEquality
58 , allEquality
52 , allEquality
59 -- ** Response equality type
53 -- ** Response equality type
60 , ResponseEquality(..)
54 , ResponseEquality(..)
src/Servant/QuickCheck/Internal/Equality.hs+2−35
@@ -1,23 +1,16 @@
1module Servant.QuickCheck.Internal.Equality where
1module Servant.QuickCheck.Internal.Equality where
2
2
3−import Data.Aeson (Value, decode, decodeStrict)
4−import Data.ByteString (ByteString)
5−import qualified Data.ByteString.Lazy as LB
6import Data.Function (on)
3import Data.Function (on)
7import Network.HTTP.Client (Response, responseBody)
4import Network.HTTP.Client (Response, responseBody)
8−import Data.Semigroup (Semigroup (..))
9import Prelude.Compat
5import Prelude.Compat
10
6
11newtype ResponseEquality b
7newtype ResponseEquality b
12 = ResponseEquality { getResponseEquality :: Response b -> Response b -> Bool }
8 = ResponseEquality { getResponseEquality :: Response b -> Response b -> Bool }
13
9
14−instance Semigroup (ResponseEquality b) where
15− ResponseEquality a <> ResponseEquality b = ResponseEquality $ \x y ->
16− a x y && b x y
17−
18instance Monoid (ResponseEquality b) where
10instance Monoid (ResponseEquality b) where
19 mempty = ResponseEquality $ \_ _ -> True
11 mempty = ResponseEquality $ \_ _ -> True
20− mappend = (<>)
12+ ResponseEquality a `mappend` ResponseEquality b = ResponseEquality $ \x y ->
13+ a x y && b x y
21
14
22-- | Use `Eq` instance for `Response`
15-- | Use `Eq` instance for `Response`
23--
16--
@@ -30,29 +23,3 @@ allEquality = ResponseEquality (==)
30-- /Since 0.0.0.0/
23-- /Since 0.0.0.0/
31bodyEquality :: Eq b => ResponseEquality b
24bodyEquality :: Eq b => ResponseEquality b
32bodyEquality = ResponseEquality ((==) `on` responseBody)
25bodyEquality = ResponseEquality ((==) `on` responseBody)
33−
34−-- | Equality as 'Value'. This means that if two bodies are equal as JSON
35−-- (e.g., insignificant whitespace difference) they are considered equal.
36−--
37−-- /Since 0.0.3.0/
38−jsonEquality :: (JsonEq b) => ResponseEquality b
39−jsonEquality = ResponseEquality (jsonEq `on` responseBody)
40−
41−class JsonEq a where
42− decode' :: a -> Maybe Value
43− jsonEq :: a -> a -> Bool
44− jsonEq first second = compareDecodedResponses (decode' first) (decode' second)
45−
46−instance JsonEq LB.ByteString where
47− decode' = decode
48−
49−instance JsonEq ByteString where
50− decode' = decodeStrict
51−
52−compareDecodedResponses :: Maybe Value -> Maybe Value -> Bool
53−compareDecodedResponses resp1 resp2 =
54− case resp1 of
55− Nothing -> False -- if decoding fails we assume failure
56− (Just r1) -> case resp2 of
57− Nothing -> False -- another decode failure
58− (Just r2) -> r1 == r2
src/Servant/QuickCheck/Internal/ErrorTypes.hs+1−3
@@ -1,4 +1,3 @@
1−{-# LANGUAGE CPP #-}
2module Servant.QuickCheck.Internal.ErrorTypes where
1module Servant.QuickCheck.Internal.ErrorTypes where
3
2
4import Control.Exception (Exception (..))
3import Control.Exception (Exception (..))
@@ -9,10 +8,9 @@ import Data.Typeable (Typeable)
9import GHC.Generics (Generic)
8import GHC.Generics (Generic)
10import qualified Network.HTTP.Client as C
9import qualified Network.HTTP.Client as C
11import Network.HTTP.Types (Header, statusCode)
10import Network.HTTP.Types (Header, statusCode)
11+import Prelude.Compat
12import Text.PrettyPrint
12import Text.PrettyPrint
13
13
14−import Prelude.Compat hiding ((<>))
15−
16data PredicateFailure
14data PredicateFailure
17 = PredicateFailure T.Text (Maybe C.Request) (C.Response LBS.ByteString)
15 = PredicateFailure T.Text (Maybe C.Request) (C.Response LBS.ByteString)
18 deriving (Typeable, Generic)
16 deriving (Typeable, Generic)
src/Servant/QuickCheck/Internal/HasGenRequest.hs+44−87
@@ -2,6 +2,7 @@
2{-# LANGUAGE PolyKinds #-}
2{-# LANGUAGE PolyKinds #-}
3module Servant.QuickCheck.Internal.HasGenRequest where
3module Servant.QuickCheck.Internal.HasGenRequest where
4
4
5+import Data.Monoid ((<>))
5import Data.String (fromString)
6import Data.String (fromString)
6import Data.String.Conversions (cs)
7import Data.String.Conversions (cs)
7import GHC.TypeLits (KnownSymbol, Nat, symbolVal)
8import GHC.TypeLits (KnownSymbol, Nat, symbolVal)
@@ -13,136 +14,102 @@ import Prelude.Compat
13import Servant
14import Servant
14import Servant.API.ContentTypes (AllMimeRender (..))
15import Servant.API.ContentTypes (AllMimeRender (..))
15import Servant.Client (BaseUrl (..), Scheme (..))
16import Servant.Client (BaseUrl (..), Scheme (..))
16−import Test.QuickCheck (Arbitrary (..), Gen, elements, frequency)
17+import Test.QuickCheck (Arbitrary (..), Gen, elements, oneof)
17−
18+#if MIN_VERSION_servant(0,8,0)
18import qualified Data.ByteString as BS
19import qualified Data.ByteString as BS
19−import qualified Data.ByteString.Internal as BS (c2w)
20+#endif
20−
21−
22−-- -----------------------------------------------------------------------------
23−-- runGenRequest
24
21
25−-- | This function returns a QuickCheck `Gen a` when passed a servant API value,
26−-- typically a `Proxy API`. The generator returned is a function
27−-- that accepts a `BaseUrl` and returns a `Request`, which can then be used
28−-- to issue network requests. This `Gen` type makes it easier to compare distinct
29−-- APIs across different `BaseUrl`s.
30−runGenRequest :: HasGenRequest a => Proxy a -> Gen (BaseUrl -> Request)
31−runGenRequest = snd . genRequest
32
22
33−
34−-- -----------------------------------------------------------------------------
35−-- HasGenRequest
36−
37−-- | This is the core Servant-Quickcheck generator, which, when given a `Proxy API`
38−-- will return a pair of `Int` and `Gen a`, where `a` is a function from
39−-- `BaseUrl` to a `Network.Http.Client.Request`. The `Int` is a weight for the
40−-- QuickCheck `frequency` function which ensures a random distribution across
41−-- all endpoints in an API.
42class HasGenRequest a where
23class HasGenRequest a where
43− genRequest :: Proxy a -> (Int, Gen (BaseUrl -> Request))
24+ genRequest :: Proxy a -> Gen (BaseUrl -> Request)
44−
45
25
46instance (HasGenRequest a, HasGenRequest b) => HasGenRequest (a :<|> b) where
26instance (HasGenRequest a, HasGenRequest b) => HasGenRequest (a :<|> b) where
47 genRequest _
27 genRequest _
48− = (lf + rf, frequency [l, r])
49− where
50− l@(lf, _) = genRequest (Proxy :: Proxy a)
28+ = oneof [ genRequest (Proxy :: Proxy a)
51− r@(rf, _) = genRequest (Proxy :: Proxy b)
29+ , genRequest (Proxy :: Proxy b)
52−
30+ ]
53
31
54instance (KnownSymbol path, HasGenRequest b) => HasGenRequest (path :> b) where
32instance (KnownSymbol path, HasGenRequest b) => HasGenRequest (path :> b) where
55− genRequest _ = (oldf, do
33+ genRequest _ = do
56 old' <- old
34 old' <- old
57− return $ \burl -> let r = old' burl
35+ return $ \burl -> let r = old' burl in r { path = new <> path r }
58− oldPath = path r
59− oldPath' = BS.dropWhile (== BS.c2w '/') oldPath
60− paths = filter (not . BS.null) [new, oldPath']
61− in r { path = "/" <> BS.intercalate "/" paths })
62 where
36 where
63− (oldf, old) = genRequest (Proxy :: Proxy b)
37+ old = genRequest (Proxy :: Proxy b)
64 new = cs $ symbolVal (Proxy :: Proxy path)
38 new = cs $ symbolVal (Proxy :: Proxy path)
65
39
66−instance HasGenRequest EmptyAPI where
67− genRequest _ = (0, error "EmptyAPIs cannot be queried.")
68−
69−instance HasGenRequest api => HasGenRequest (Summary d :> api) where
70− genRequest _ = genRequest (Proxy :: Proxy api)
71−
72−instance HasGenRequest api => HasGenRequest (Description d :> api) where
73− genRequest _ = genRequest (Proxy :: Proxy api)
74−
75instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
40instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
76− => HasGenRequest (Capture' mods x c :> b) where
41+ => HasGenRequest (Capture x c :> b) where
77− genRequest _ = (oldf, do
42+ genRequest _ = do
78 old' <- old
43 old' <- old
79 new' <- toUrlPiece <$> new
44 new' <- toUrlPiece <$> new
80− return $ \burl -> let r = old' burl in r { path = cs new' <> path r })
45+ return $ \burl -> let r = old' burl in r { path = cs new' <> path r }
81 where
46 where
82− (oldf, old) = genRequest (Proxy :: Proxy b)
47+ old = genRequest (Proxy :: Proxy b)
83 new = arbitrary :: Gen c
48 new = arbitrary :: Gen c
84
49
50+#if MIN_VERSION_servant(0,8,0)
85instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
51instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
86 => HasGenRequest (CaptureAll x c :> b) where
52 => HasGenRequest (CaptureAll x c :> b) where
87− genRequest _ = (oldf, do
53+ genRequest _ = do
88 old' <- old
54 old' <- old
89 new' <- fmap (cs . toUrlPiece) <$> new
55 new' <- fmap (cs . toUrlPiece) <$> new
90 let new'' = BS.intercalate "/" new'
56 let new'' = BS.intercalate "/" new'
91− return $ \burl -> let r = old' burl in r { path = new'' <> path r })
57+ return $ \burl -> let r = old' burl in r { path = new'' <> path r }
92 where
58 where
93− (oldf, old) = genRequest (Proxy :: Proxy b)
59+ old = genRequest (Proxy :: Proxy b)
94 new = arbitrary :: Gen [c]
60 new = arbitrary :: Gen [c]
61+#endif
95
62
96instance (Arbitrary c, KnownSymbol h, HasGenRequest b, ToHttpApiData c)
63instance (Arbitrary c, KnownSymbol h, HasGenRequest b, ToHttpApiData c)
97− => HasGenRequest (Header' mods h c :> b) where
64+ => HasGenRequest (Header h c :> b) where
98− genRequest _ = (oldf, do
65+ genRequest _ = do
99 old' <- old
66 old' <- old
100− new' <- toUrlPiece <$> new -- TODO: generate lenient or/and optional
67+ new' <- toUrlPiece <$> new
101 return $ \burl -> let r = old' burl in r {
68 return $ \burl -> let r = old' burl in r {
102− requestHeaders = (hdr, cs new') : requestHeaders r })
69+ requestHeaders = (hdr, cs new') : requestHeaders r }
103 where
70 where
104− (oldf, old) = genRequest (Proxy :: Proxy b)
71+ old = genRequest (Proxy :: Proxy b)
105 hdr = fromString $ symbolVal (Proxy :: Proxy h)
72 hdr = fromString $ symbolVal (Proxy :: Proxy h)
106 new = arbitrary :: Gen c
73 new = arbitrary :: Gen c
107
74
108instance (AllMimeRender x c, Arbitrary c, HasGenRequest b)
75instance (AllMimeRender x c, Arbitrary c, HasGenRequest b)
109− => HasGenRequest (ReqBody' mods x c :> b) where
76+ => HasGenRequest (ReqBody x c :> b) where
110− genRequest _ = (oldf, do
77+ genRequest _ = do
111− old' <- old -- TODO: generate lenient
78+ old' <- old
112 new' <- new
79 new' <- new
113 (ct, bd) <- elements $ allMimeRender (Proxy :: Proxy x) new'
80 (ct, bd) <- elements $ allMimeRender (Proxy :: Proxy x) new'
114 return $ \burl -> let r = old' burl in r {
81 return $ \burl -> let r = old' burl in r {
115 requestBody = RequestBodyLBS bd
82 requestBody = RequestBodyLBS bd
116 , requestHeaders = ("Content-Type", renderHeader ct) : requestHeaders r
83 , requestHeaders = ("Content-Type", renderHeader ct) : requestHeaders r
117− })
84+ }
118 where
85 where
119− (oldf, old) = genRequest (Proxy :: Proxy b)
86+ old = genRequest (Proxy :: Proxy b)
120 new = arbitrary :: Gen c
87 new = arbitrary :: Gen c
121
88
122instance (KnownSymbol x, Arbitrary c, ToHttpApiData c, HasGenRequest b)
89instance (KnownSymbol x, Arbitrary c, ToHttpApiData c, HasGenRequest b)
123− => HasGenRequest (QueryParam' mods x c :> b) where
90+ => HasGenRequest (QueryParam x c :> b) where
124− genRequest _ = (oldf, do
91+ genRequest _ = do
125− new' <- new -- TODO: generate lenient or/and optional
92+ new' <- new
126 old' <- old
93 old' <- old
127 return $ \burl -> let r = old' burl
94 return $ \burl -> let r = old' burl
128 newExpr = param <> "=" <> cs (toQueryParam new')
95 newExpr = param <> "=" <> cs (toQueryParam new')
129 qs = queryString r in r {
96 qs = queryString r in r {
130− queryString = if BS.null qs then newExpr else newExpr <> "&" <> qs })
97+ queryString = if BS.null qs then newExpr else newExpr <> "&" <> qs }
131 where
98 where
132− (oldf, old) = genRequest (Proxy :: Proxy b)
99+ old = genRequest (Proxy :: Proxy b)
133 param = cs $ symbolVal (Proxy :: Proxy x)
100 param = cs $ symbolVal (Proxy :: Proxy x)
134 new = arbitrary :: Gen c
101 new = arbitrary :: Gen c
135
102
136instance (KnownSymbol x, Arbitrary c, ToHttpApiData c, HasGenRequest b)
103instance (KnownSymbol x, Arbitrary c, ToHttpApiData c, HasGenRequest b)
137 => HasGenRequest (QueryParams x c :> b) where
104 => HasGenRequest (QueryParams x c :> b) where
138− genRequest _ = (oldf, do
105+ genRequest _ = do
139 new' <- new
106 new' <- new
140 old' <- old
107 old' <- old
141 return $ \burl -> let r = old' burl in r {
108 return $ \burl -> let r = old' burl in r {
142 queryString = queryString r
109 queryString = queryString r
143− <> if length new' > 0 then fold (toParam <$> new') else ""})
110+ <> if length new' > 0 then fold (toParam <$> new') else ""}
144 where
111 where
145− (oldf, old) = genRequest (Proxy :: Proxy b)
112+ old = genRequest (Proxy :: Proxy b)
146 param = cs $ symbolVal (Proxy :: Proxy x)
113 param = cs $ symbolVal (Proxy :: Proxy x)
147 new = arbitrary :: Gen [c]
114 new = arbitrary :: Gen [c]
148 toParam c = param <> "[]=" <> cs (toQueryParam c)
115 toParam c = param <> "[]=" <> cs (toQueryParam c)
@@ -150,32 +117,22 @@ instance (KnownSymbol x, Arbitrary c, ToHttpApiData c, HasGenRequest b)
150
117
151instance (KnownSymbol x, HasGenRequest b)
118instance (KnownSymbol x, HasGenRequest b)
152 => HasGenRequest (QueryFlag x :> b) where
119 => HasGenRequest (QueryFlag x :> b) where
153− genRequest _ = (oldf, do
120+ genRequest _ = do
154 old' <- old
121 old' <- old
155− return $ \burl -> let r = old' burl
122+ return $ \burl -> let r = old' burl in r {
156− qs = queryString r in r {
157− queryString = if BS.null qs then param else param <> "&" <> qs })
123+ queryString = queryString r <> param <> "=" }
158 where
124 where
159− (oldf, old) = genRequest (Proxy :: Proxy b)
125+ old = genRequest (Proxy :: Proxy b)
160 param = cs $ symbolVal (Proxy :: Proxy x)
126 param = cs $ symbolVal (Proxy :: Proxy x)
161
127
162instance (ReflectMethod method)
128instance (ReflectMethod method)
163 => HasGenRequest (Verb (method :: k) (status :: Nat) (cts :: [*]) a) where
129 => HasGenRequest (Verb (method :: k) (status :: Nat) (cts :: [*]) a) where
164− genRequest _ = (1, return $ \burl -> defaultRequest
165− { host = cs $ baseUrlHost burl
166− , port = baseUrlPort burl
167− , secure = baseUrlScheme burl == Https
168− , method = reflectMethod (Proxy :: Proxy method)
169− })
170−
171−instance (ReflectMethod method)
172− => HasGenRequest (NoContentVerb (method :: k)) where
173− genRequest _ = (1, return $ \burl -> defaultRequest
130+ genRequest _ = return $ \burl -> defaultRequest
174 { host = cs $ baseUrlHost burl
131 { host = cs $ baseUrlHost burl
175 , port = baseUrlPort burl
132 , port = baseUrlPort burl
176 , secure = baseUrlScheme burl == Https
133 , secure = baseUrlScheme burl == Https
177 , method = reflectMethod (Proxy :: Proxy method)
134 , method = reflectMethod (Proxy :: Proxy method)
178− })
135+ }
179
136
180instance (HasGenRequest a) => HasGenRequest (RemoteHost :> a) where
137instance (HasGenRequest a) => HasGenRequest (RemoteHost :> a) where
181 genRequest _ = genRequest (Proxy :: Proxy a)
138 genRequest _ = genRequest (Proxy :: Proxy a)
src/Servant/QuickCheck/Internal/Predicates.hs+31−63
@@ -7,12 +7,11 @@ import Data.Bifunctor (first)
7import qualified Data.ByteString as SBS
7import qualified Data.ByteString as SBS
8import qualified Data.ByteString.Char8 as SBSC
8import qualified Data.ByteString.Char8 as SBSC
9import qualified Data.ByteString.Lazy as LBS
9import qualified Data.ByteString.Lazy as LBS
10−import Data.CaseInsensitive (foldCase, foldedCase, mk)
10+import Data.CaseInsensitive (mk, foldedCase)
11import Data.Either (isRight)
11import Data.Either (isRight)
12import Data.List.Split (wordsBy)
12import Data.List.Split (wordsBy)
13import Data.Maybe (fromMaybe, isJust)
13import Data.Maybe (fromMaybe, isJust)
14−import Data.Semigroup (Semigroup (..))
14+import Data.Monoid ((<>))
15−import qualified Data.Text as T
16import Data.Time (UTCTime, defaultTimeLocale, parseTimeM,
15import Data.Time (UTCTime, defaultTimeLocale, parseTimeM,
17 rfc822DateFormat)
16 rfc822DateFormat)
18import GHC.Generics (Generic)
17import GHC.Generics (Generic)
@@ -43,7 +42,7 @@ import Servant.QuickCheck.Internal.ErrorTypes
43-- /Since 0.0.0.0/
42-- /Since 0.0.0.0/
44not500 :: ResponsePredicate
43not500 :: ResponsePredicate
45not500 = ResponsePredicate $ \resp ->
44not500 = ResponsePredicate $ \resp ->
46− when (responseStatus resp == status500) $ throw $ PredicateFailure "not500" Nothing resp
45+ when (responseStatus resp == status500) $ fail "not500"
47
46
48-- | [__Optional__]
47-- | [__Optional__]
49--
48--
@@ -84,13 +83,15 @@ notLongerThan maxAllowed
84-- /Since 0.0.0.0/
83-- /Since 0.0.0.0/
85onlyJsonObjects :: ResponsePredicate
84onlyJsonObjects :: ResponsePredicate
86onlyJsonObjects
85onlyJsonObjects
87− = ResponsePredicate (\resp -> do
86+ = ResponsePredicate (\resp -> case go resp of
87+ Nothing -> throw $ PredicateFailure "onlyJsonObjects" Nothing resp
88+ Just () -> return ())
89+ where
90+ go r = do
88− case lookup "content-type" (first foldedCase <$> responseHeaders resp) of
91+ ctyp <- lookup "content-type" (first foldedCase <$> responseHeaders r)
89− Nothing -> return ()
90− Just ctype -> when ("application/json" `SBS.isPrefixOf` ctype) $ do
92+ when ("application/json" `SBS.isPrefixOf` ctyp) $ do
91− case (decode (responseBody resp) :: Maybe Object) of
93+ (_ :: Object) <- decode (responseBody r)
92− Nothing -> throw $ PredicateFailure "onlyJsonObjects" Nothing resp
93− Just _ -> return ())
94+ return ()
94
95
95-- | __Optional__
96-- | __Optional__
96--
97--
@@ -118,12 +119,12 @@ createContainsValidLocation
118 resp <- httpLbs req mgr
119 resp <- httpLbs req mgr
119 if responseStatus resp == status201
120 if responseStatus resp == status201
120 then case lookup "Location" $ responseHeaders resp of
121 then case lookup "Location" $ responseHeaders resp of
121− Nothing -> throw $ PredicateFailure n (Just req) resp
122+ Nothing -> fail n
122 Just l -> case parseRequest $ SBSC.unpack l of
123 Just l -> case parseRequest $ SBSC.unpack l of
123− Nothing -> throw $ PredicateFailure n (Just req) resp
124+ Nothing -> fail n
124 Just x -> do
125 Just x -> do
125 resp2 <- httpLbs x mgr
126 resp2 <- httpLbs x mgr
126− status2XX (Just req) resp2 n
127+ status2XX resp2 n
127 return [resp, resp2]
128 return [resp, resp2]
128 else return [resp]
129 else return [resp]
129
130
@@ -187,15 +188,14 @@ getsHaveLastModifiedHeader
187notAllowedContainsAllowHeader :: RequestPredicate
188notAllowedContainsAllowHeader :: RequestPredicate
188notAllowedContainsAllowHeader
189notAllowedContainsAllowHeader
189 = RequestPredicate $ \req mgr -> do
190 = RequestPredicate $ \req mgr -> do
190− let reqs = [ req { method = renderStdMethod m } | m <- [minBound .. maxBound]
191+ resp <- mapM (flip httpLbs mgr) $ [ req { method = renderStdMethod m }
192+ | m <- [minBound .. maxBound ]
191− , renderStdMethod m /= method req ]
193+ , renderStdMethod m /= method req ]
192− resp <- mapM (flip httpLbs mgr) reqs
193−
194− case filter pred' (zip reqs resp) of
194+ case filter pred' resp of
195− (x:_) -> throw $ PredicateFailure "notAllowedContainsAllowHeader" (Just $ fst x) (snd x)
195+ (x:_) -> throw $ PredicateFailure "notAllowedContainsAllowHeader" (Just req) x
196 [] -> return resp
196 [] -> return resp
197 where
197 where
198− pred' (_, resp) = responseStatus resp == status405 && not (hasValidHeader "Allow" go resp)
198+ pred' resp = responseStatus resp == status405 && not (hasValidHeader "Allow" go resp)
199 where
199 where
200 go x = all (\y -> isRight $ parseMethod $ SBSC.pack y)
200 go x = all (\y -> isRight $ parseMethod $ SBSC.pack y)
201 $ wordsBy (`elem` (", " :: [Char])) (SBSC.unpack x)
201 $ wordsBy (`elem` (", " :: [Char])) (SBSC.unpack x)
@@ -225,7 +225,7 @@ honoursAcceptHeader
225 sacc = fromMaybe "*/*" $ lookup "Accept" (requestHeaders req)
225 sacc = fromMaybe "*/*" $ lookup "Accept" (requestHeaders req)
226 if status100 < scode && scode < status300
226 if status100 < scode && scode < status300
227 then if isJust $ sctype >>= \x -> matchAccept [x] sacc
227 then if isJust $ sctype >>= \x -> matchAccept [x] sacc
228− then throw $ PredicateFailure "honoursAcceptHeader" (Just req) resp
228+ then fail "honoursAcceptHeader"
229 else return [resp]
229 else return [resp]
230 else return [resp]
230 else return [resp]
231
231
@@ -336,29 +336,7 @@ unauthorizedContainsWWWAuthenticate
336 = ResponsePredicate $ \resp ->
336 = ResponsePredicate $ \resp ->
337 if responseStatus resp == status401
337 if responseStatus resp == status401
338 then unless (hasValidHeader "WWW-Authenticate" (const True) resp) $
338 then unless (hasValidHeader "WWW-Authenticate" (const True) resp) $
339− throw $ PredicateFailure "unauthorizedContainsWWWAuthenticate" Nothing resp
339+ fail "unauthorizedContainsWWWAuthenticate"
340− else return ()
341−
342−
343−-- | [__RFC Compliance__]
344−--
345−-- [An HTML] document will start with exactly this string: <!DOCTYPE html>
346−--
347−-- This function checks that HTML documents (those with `Content-Type: text/html...`)
348−-- include a DOCTYPE declaration at the top. We do not enforce capital case for the string `DOCTYPE`.
349−--
350−-- __References__:
351−--
352−-- * HTML5 Doctype: <https://tools.ietf.org/html/rfc7992#section-6.1 RFC 7992 Section 6.1>
353−-- /Since 0.3.0.0/
354−htmlIncludesDoctype :: ResponsePredicate
355−htmlIncludesDoctype
356− = ResponsePredicate $ \resp ->
357− if hasValidHeader "Content-Type" (SBS.isPrefixOf . foldCase $ "text/html") resp
358− then do
359− let htmlContent = foldCase . LBS.take 20 $ responseBody resp
360− unless (LBS.isPrefixOf (foldCase "<!doctype html>") htmlContent) $
361− throw $ PredicateFailure "htmlIncludesDoctype" Nothing resp
362 else return ()
340 else return ()
363
341
364-- * Predicate logic
342-- * Predicate logic
@@ -376,12 +354,9 @@ newtype ResponsePredicate = ResponsePredicate
376 { getResponsePredicate :: Response LBS.ByteString -> IO ()
354 { getResponsePredicate :: Response LBS.ByteString -> IO ()
377 } deriving (Generic)
355 } deriving (Generic)
378
356
379−instance Semigroup ResponsePredicate where
380− ResponsePredicate a <> ResponsePredicate b = ResponsePredicate $ \x -> a x >> b x
381−
382instance Monoid ResponsePredicate where
357instance Monoid ResponsePredicate where
383 mempty = ResponsePredicate $ const $ return ()
358 mempty = ResponsePredicate $ const $ return ()
384− mappend = (<>)
359+ ResponsePredicate a `mappend` ResponsePredicate b = ResponsePredicate $ \x -> a x >> b x
385
360
386-- | A predicate that depends on both the request and the response.
361-- | A predicate that depends on both the request and the response.
387--
362--
@@ -393,11 +368,7 @@ newtype RequestPredicate = RequestPredicate
393-- TODO: This isn't actually a monoid
368-- TODO: This isn't actually a monoid
394instance Monoid RequestPredicate where
369instance Monoid RequestPredicate where
395 mempty = RequestPredicate (\r m -> httpLbs r m >>= \x -> return ([x]))
370 mempty = RequestPredicate (\r m -> httpLbs r m >>= \x -> return ([x]))
396− mappend = (<>)
397−
398−-- TODO: This isn't actually a monoid
399−instance Semigroup RequestPredicate where
400− RequestPredicate a <> RequestPredicate b = RequestPredicate $ \r mgr ->
371+ RequestPredicate a `mappend` RequestPredicate b = RequestPredicate $ \r mgr ->
401 liftM2 (<>) (a r mgr) (b r mgr)
372 liftM2 (<>) (a r mgr) (b r mgr)
402
373
403-- | A set of predicates. Construct one with 'mempty' and '<%>'.
374-- | A set of predicates. Construct one with 'mempty' and '<%>'.
@@ -406,13 +377,10 @@ data Predicates = Predicates
406 , responsePredicates :: ResponsePredicate
377 , responsePredicates :: ResponsePredicate
407 } deriving (Generic)
378 } deriving (Generic)
408
379
409−instance Semigroup Predicates where
410− a <> b = Predicates (requestPredicates a <> requestPredicates b)
411− (responsePredicates a <> responsePredicates b)
412−
413instance Monoid Predicates where
380instance Monoid Predicates where
414 mempty = Predicates mempty mempty
381 mempty = Predicates mempty mempty
415− mappend = (<>)
382+ a `mappend` b = Predicates (requestPredicates a <> requestPredicates b)
383+ (responsePredicates a <> responsePredicates b)
416
384
417class JoinPreds a where
385class JoinPreds a where
418 joinPreds :: a -> Predicates -> Predicates
386 joinPreds :: a -> Predicates -> Predicates
@@ -454,8 +422,8 @@ isRFC822Date s
454 Nothing -> False
422 Nothing -> False
455 Just (_ :: UTCTime) -> True
423 Just (_ :: UTCTime) -> True
456
424
457−status2XX :: Monad m => Maybe Request -> Response LBS.ByteString -> T.Text -> m ()
425+status2XX :: Monad m => Response b -> String -> m ()
458−status2XX mreq resp t
426+status2XX r t
459− | status200 <= responseStatus resp && responseStatus resp < status300
427+ | status200 <= responseStatus r && responseStatus r < status300
460 = return ()
428 = return ()
461− | otherwise = throw $ PredicateFailure t mreq resp
429+ | otherwise = fail t
src/Servant/QuickCheck/Internal/QuickCheck.hs+27−64
@@ -2,7 +2,7 @@
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3module Servant.QuickCheck.Internal.QuickCheck where
3module Servant.QuickCheck.Internal.QuickCheck where
4
4
5−import Control.Concurrent (tryReadMVar, newEmptyMVar, tryPutMVar)
5+import Control.Concurrent (modifyMVar_, newMVar, readMVar)
6import Control.Monad (unless)
6import Control.Monad (unless)
7import qualified Data.ByteString.Lazy as LBS
7import qualified Data.ByteString.Lazy as LBS
8import Data.Proxy (Proxy)
8import Data.Proxy (Proxy)
@@ -11,13 +11,11 @@ import Network.Wai.Handler.Warp (withApplication)
11import Prelude.Compat
11import Prelude.Compat
12import Servant (Context (EmptyContext), HasServer,
12import Servant (Context (EmptyContext), HasServer,
13 Server, serveWithContext)
13 Server, serveWithContext)
14−#if MIN_VERSION_servant_server(0,18,0)
15−import Servant (DefaultErrorFormatters, ErrorFormatters, HasContextEntry, type (.++))
16−#endif
17import Servant.Client (BaseUrl (..), Scheme (..))
14import Servant.Client (BaseUrl (..), Scheme (..))
18import System.IO.Unsafe (unsafePerformIO)
15import System.IO.Unsafe (unsafePerformIO)
19import Test.Hspec (Expectation, expectationFailure)
16import Test.Hspec (Expectation, expectationFailure)
20−import Test.QuickCheck (Args (..), Result (..), quickCheckWithResult)
17+import Test.QuickCheck (Args (..), Result (..),
18+ quickCheckWithResult)
21import Test.QuickCheck.Monadic (assert, forAllM, monadicIO, monitor,
19import Test.QuickCheck.Monadic (assert, forAllM, monadicIO, monitor,
22 run)
20 run)
23import Test.QuickCheck.Property (counterexample)
21import Test.QuickCheck.Property (counterexample)
@@ -40,11 +38,7 @@ withServantServer api = withServantServerAndContext api EmptyContext
40-- application.
38-- application.
41--
39--
42-- /Since 0.0.0.0/
40-- /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
46withServantServerAndContext :: HasServer a ctx
41withServantServerAndContext :: HasServer a ctx
47−#endif
48 => Proxy a -> Context ctx -> IO (Server a) -> (BaseUrl -> IO r) -> IO r
42 => Proxy a -> Context ctx -> IO (Server a) -> (BaseUrl -> IO r) -> IO r
49withServantServerAndContext api ctx server t
43withServantServerAndContext api ctx server t
50 = withApplication (return . serveWithContext api ctx =<< server) $ \port ->
44 = withApplication (return . serveWithContext api ctx =<< server) $ \port ->
@@ -77,32 +71,25 @@ withServantServerAndContext api ctx server t
77serversEqual :: HasGenRequest a =>
71serversEqual :: HasGenRequest a =>
78 Proxy a -> BaseUrl -> BaseUrl -> Args -> ResponseEquality LBS.ByteString -> Expectation
72 Proxy a -> BaseUrl -> BaseUrl -> Args -> ResponseEquality LBS.ByteString -> Expectation
79serversEqual api burl1 burl2 args req = do
73serversEqual api burl1 burl2 args req = do
80− let reqs = (\f -> (f burl1, f burl2)) <$> runGenRequest api
74+ let reqs = (\f -> (f burl1, f burl2)) <$> genRequest api
81 -- This MVar stuff is clunky! But there doesn't seem to be an easy way to
75 -- This MVar stuff is clunky! But there doesn't seem to be an easy way to
82 -- return results when a test fails, since an exception is throw.
76 -- return results when a test fails, since an exception is throw.
83− deetsMVar <- newEmptyMVar
77+ deetsMVar <- newMVar $ error "should not be called"
84 r <- quickCheckWithResult args { chatty = False } $ monadicIO $ forAllM reqs $ \(req1, req2) -> do
78 r <- quickCheckWithResult args { chatty = False } $ monadicIO $ forAllM reqs $ \(req1, req2) -> do
85 resp1 <- run $ C.httpLbs (noCheckStatus req1) defManager
79 resp1 <- run $ C.httpLbs (noCheckStatus req1) defManager
86 resp2 <- run $ C.httpLbs (noCheckStatus req2) defManager
80 resp2 <- run $ C.httpLbs (noCheckStatus req2) defManager
87 unless (getResponseEquality req resp1 resp2) $ do
81 unless (getResponseEquality req resp1 resp2) $ do
88 monitor (counterexample "hi" )
82 monitor (counterexample "hi" )
83+ run $ modifyMVar_ deetsMVar $ const $ return $
89− _ <- run $ tryPutMVar deetsMVar $ ServerEqualityFailure req1 resp1 resp2
84+ ServerEqualityFailure req1 resp1 resp2
90 assert False
85 assert False
91 case r of
86 case r of
92 Success {} -> return ()
87 Success {} -> return ()
93− Failure{..} -> do
88+ Failure{..} -> readMVar deetsMVar >>= \x -> expectationFailure $
94− mx <- tryReadMVar deetsMVar
95− case mx of
96− Just x ->
97− expectationFailure $ "Failed:\n" ++ show x
89+ "Failed:\n" ++ show x
98− Nothing ->
99− expectationFailure $ "We failed to record a reason for failure: " <> show r
100 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
90 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
101− NoExpectedFailure {} -> expectationFailure "No expected failure"
91+ NoExpectedFailure {} -> expectationFailure $ "No expected failure"
102−#if MIN_VERSION_QuickCheck(2,12,0)
103−#else
104− InsufficientCoverage {} -> expectationFailure "Insufficient coverage"
92+ InsufficientCoverage {} -> expectationFailure $ "Insufficient coverage"
105−#endif
106
93
107-- | Check that a server satisfies the set of properties specified.
94-- | Check that a server satisfies the set of properties specified.
108--
95--
@@ -125,61 +112,37 @@ serversEqual api burl1 burl2 args req = do
125-- /Since 0.0.0.0/
112-- /Since 0.0.0.0/
126serverSatisfies :: (HasGenRequest a) =>
113serverSatisfies :: (HasGenRequest a) =>
127 Proxy a -> BaseUrl -> Args -> Predicates -> Expectation
114 Proxy a -> BaseUrl -> Args -> Predicates -> Expectation
128−serverSatisfies api = serverSatisfiesMgr api defManager
115+serverSatisfies api burl args preds = do
129−
130−-- | Check that a server satisfies the set of properties specified, and
131−-- accept a 'Manager' for running the HTTP requests through.
132−--
133−-- See 'serverSatisfies' for more details.
134−--
135−-- @since 0.0.7.2
136−serverSatisfiesMgr :: (HasGenRequest a) =>
137− Proxy a -> C.Manager -> BaseUrl -> Args -> Predicates -> Expectation
138−serverSatisfiesMgr api manager burl args preds = do
139− let reqs = ($ burl) <$> runGenRequest api
116+ let reqs = ($ burl) <$> genRequest api
140− deetsMVar <- newEmptyMVar
117+ deetsMVar <- newMVar $ error "should not be called"
141 r <- quickCheckWithResult args { chatty = False } $ monadicIO $ forAllM reqs $ \req -> do
118 r <- quickCheckWithResult args { chatty = False } $ monadicIO $ forAllM reqs $ \req -> do
142− v <- run $ finishPredicates preds (noCheckStatus req) manager
119+ v <- run $ finishPredicates preds (noCheckStatus req) defManager
143− _ <- run $ tryPutMVar deetsMVar v
120+ run $ modifyMVar_ deetsMVar $ const $ return v
144− case v of
121+ case v of
145− Just _ -> assert False
122+ Just _ -> assert False
146− _ -> return ()
123+ _ -> return ()
147 case r of
124 case r of
148 Success {} -> return ()
125 Success {} -> return ()
149− Failure {..} -> do
126+ Failure{..} -> readMVar deetsMVar >>= \x -> expectationFailure $
150− mx <- tryReadMVar deetsMVar
151− case mx of
152− Just x ->
153− expectationFailure $ "Failed:\n" ++ show x
127+ "Failed:\n" ++ show x
154− Nothing ->
155− expectationFailure $ "We failed to record a reason for failure: " <> show r
156 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
128 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
157 NoExpectedFailure {} -> expectationFailure $ "No expected failure"
129 NoExpectedFailure {} -> expectationFailure $ "No expected failure"
158−#if MIN_VERSION_QuickCheck(2,12,0)
159−#else
160− InsufficientCoverage {} -> expectationFailure "Insufficient coverage"
130+ InsufficientCoverage {} -> expectationFailure $ "Insufficient coverage"
161−#endif
131+
162
132
163serverDoesntSatisfy :: (HasGenRequest a) =>
133serverDoesntSatisfy :: (HasGenRequest a) =>
164 Proxy a -> BaseUrl -> Args -> Predicates -> Expectation
134 Proxy a -> BaseUrl -> Args -> Predicates -> Expectation
165−serverDoesntSatisfy api = serverDoesntSatisfyMgr api defManager
135+serverDoesntSatisfy api burl args preds = do
166−
167−serverDoesntSatisfyMgr :: (HasGenRequest a) =>
168− Proxy a -> C.Manager -> BaseUrl -> Args -> Predicates -> Expectation
169−serverDoesntSatisfyMgr api manager burl args preds = do
170− let reqs = ($ burl) <$> runGenRequest api
136+ let reqs = ($ burl) <$> genRequest api
171 r <- quickCheckWithResult args $ monadicIO $ forAllM reqs $ \req -> do
137 r <- quickCheckWithResult args $ monadicIO $ forAllM reqs $ \req -> do
172− v <- run $ finishPredicates preds (noCheckStatus req) manager
138+ v <- run $ finishPredicates preds (noCheckStatus req) defManager
173 assert $ not $ null v
139 assert $ not $ null v
174 case r of
140 case r of
175 Success {} -> return ()
141 Success {} -> return ()
176 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
142 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
177 Failure { output = m } -> expectationFailure $ "Failed:\n" ++ show m
143 Failure { output = m } -> expectationFailure $ "Failed:\n" ++ show m
178 NoExpectedFailure {} -> expectationFailure $ "No expected failure"
144 NoExpectedFailure {} -> expectationFailure $ "No expected failure"
179−#if MIN_VERSION_QuickCheck(2,12,0)
180−#else
181− InsufficientCoverage {} -> expectationFailure "Insufficient coverage"
145+ InsufficientCoverage {} -> expectationFailure $ "Insufficient coverage"
182−#endif
183
146
184noCheckStatus :: C.Request -> C.Request
147noCheckStatus :: C.Request -> C.Request
185#if MIN_VERSION_http_client(0,5,0)
148#if MIN_VERSION_http_client(0,5,0)
stack-ghc-8.0.1.yamlnew file+10
@@ -0,0 +1,10 @@
1+# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
2+resolver: nightly-2016-10-03
3+packages:
4+- '.'
5+extra-deps:
6+- 'servant-0.9'
7+- 'servant-server-0.9'
8+- 'servant-client-0.9'
9+flags: {}
10+extra-package-dbs: []
stack.yaml+3−6
@@ -1,10 +1,7 @@
1+# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
1−resolver: nightly-2018-09-03
2+resolver: lts-6.17
2packages:
3packages:
3- '.'
4- '.'
4−extra-deps:
5+extra-deps: []
5−- hspec-discover-2.5.6
6−- hspec-core-2.5.6
7−- hspec-2.5.6
8−- QuickCheck-2.12
9flags: {}
6flags: {}
10extra-package-dbs: []
7extra-package-dbs: []
test/Doctest.hsnew file+44
@@ -0,0 +1,44 @@
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
test/Servant/QuickCheck/InternalSpec.hs+36−214
@@ -1,33 +1,29 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2module Servant.QuickCheck.InternalSpec (spec) where
2module Servant.QuickCheck.InternalSpec (spec) where
3
3
4−
5import Control.Concurrent.MVar (newMVar, readMVar, swapMVar)
4import Control.Concurrent.MVar (newMVar, readMVar, swapMVar)
6−import Control.Exception (SomeException)
7−import Control.Monad (replicateM)
8import Control.Monad.IO.Class (liftIO)
5import Control.Monad.IO.Class (liftIO)
9import qualified Data.ByteString as BS
6import qualified Data.ByteString as BS
10import qualified Data.ByteString.Char8 as C
7import qualified Data.ByteString.Char8 as C
11−import Data.Maybe (fromJust)
12−import Network.HTTP.Client (path, queryString)
13import Prelude.Compat
8import Prelude.Compat
14import Servant
9import Servant
15−import Servant.HTML.Blaze (HTML)
16−import qualified Text.Blaze.Html as Blaze
17−import qualified Text.Blaze.Html5 as Blaze5
18import Test.Hspec (Spec, context, describe, it, shouldBe,
10import Test.Hspec (Spec, context, describe, it, shouldBe,
19 shouldContain)
11 shouldContain)
20−import Test.Hspec.Core.Spec (Arg, Example, Result (..), ResultStatus (..),
12+import Test.Hspec.Core.Spec (Arg, Example, Result (..),
21− defaultParams, safeEvaluateExample)
13+ defaultParams, evaluateExample)
22−import Test.QuickCheck.Gen (generate, unGen)
14+import Test.QuickCheck.Gen (unGen)
23import Test.QuickCheck.Random (mkQCGen)
15import Test.QuickCheck.Random (mkQCGen)
16+import Network.HTTP.Client (queryString)
24
17
25−
18+#if MIN_VERSION_servant(0,8,0)
26−import Servant.Test.ComprehensiveAPI (comprehensiveAPIWithoutStreamingOrRaw)
19+import Servant.API.Internal.Test.ComprehensiveAPI (comprehensiveAPIWithoutRaw)
20+#else
21+import Servant.API.Internal.Test.ComprehensiveAPI (ComprehensiveAPI,
22+ comprehensiveAPI)
23+#endif
27
24
28import Servant.QuickCheck
25import Servant.QuickCheck
29−import Servant.QuickCheck.Internal (genRequest, runGenRequest,
26+import Servant.QuickCheck.Internal (genRequest, serverDoesntSatisfy)
30− serverDoesntSatisfy)
31
27
32spec :: Spec
28spec :: Spec
33spec = do
29spec = do
@@ -37,10 +33,6 @@ spec = do
37 onlyJsonObjectSpec
33 onlyJsonObjectSpec
38 notLongerThanSpec
34 notLongerThanSpec
39 queryParamsSpec
35 queryParamsSpec
40− queryFlagsSpec
41− deepPathSpec
42− htmlDocTypesSpec
43− unbiasedGenerationSpec
44
36
45serversEqualSpec :: Spec
37serversEqualSpec :: Spec
46serversEqualSpec = describe "serversEqual" $ do
38serversEqualSpec = describe "serversEqual" $ do
@@ -51,42 +43,15 @@ serversEqualSpec = describe "serversEqual" $ do
51 serversEqual api burl1 burl2 args bodyEquality
43 serversEqual api burl1 burl2 args bodyEquality
52
44
53 context "when servers are not equal" $ do
45 context "when servers are not equal" $ do
46+
47+
54 it "provides the failing responses in the error message" $ do
48 it "provides the failing responses in the error message" $ do
55− FailedWith err <- withServantServer api2 server2 $ \burl1 ->
49+ Fail _ err <- withServantServer api2 server2 $ \burl1 ->
56 withServantServer api2 server3 $ \burl2 -> do
50 withServantServer api2 server3 $ \burl2 -> do
57 evalExample $ serversEqual api2 burl1 burl2 args bodyEquality
51 evalExample $ serversEqual api2 burl1 burl2 args bodyEquality
58− show err `shouldContain` "Server equality failed"
59 show err `shouldContain` "Body: 1"
52 show err `shouldContain` "Body: 1"
60 show err `shouldContain` "Body: 2"
53 show err `shouldContain` "Body: 2"
61− show err `shouldContain` "Path: /failplz"
54+ show err `shouldContain` "Path: failplz/"
62−
63− context "when JSON is equal but looks a bit different as a ByteString" $ do
64−
65− it "sanity check: different whitespace same JSON objects bodyEquality fails" $ do
66− FailedWith err <- withServantServer jsonApi jsonServer1 $ \burl1 ->
67− withServantServer jsonApi jsonServer2 $ \burl2 -> do
68− evalExample $ serversEqual jsonApi burl1 burl2 args bodyEquality
69− show err `shouldContain` "Server equality failed"
70−
71− it "jsonEquality considers equal JSON apis equal regardless of key ordering or whitespace" $ do
72− withServantServerAndContext jsonApi ctx jsonServer1 $ \burl1 ->
73− withServantServerAndContext jsonApi ctx jsonServer2 $ \burl2 ->
74− serversEqual jsonApi burl1 burl2 args jsonEquality
75−
76− it "sees when JSON apis are not equal because any value is different" $ do
77− FailedWith err <- withServantServer jsonApi jsonServer2 $ \burl1 ->
78− withServantServer jsonApi jsonServer3 $ \burl2 -> do
79− evalExample $ serversEqual jsonApi burl1 burl2 args jsonEquality
80− show err `shouldContain` "Server equality failed"
81− show err `shouldContain` "Path: /jsonComparison"
82−
83− it "sees when JSON apis are not equal due to different keys but same values" $ do
84− FailedWith err <- withServantServer jsonApi jsonServer2 $ \burl1 ->
85− withServantServer jsonApi jsonServer4 $ \burl2 -> do
86− evalExample $ serversEqual jsonApi burl1 burl2 args jsonEquality
87− show err `shouldContain` "Server equality failed"
88− show err `shouldContain` "Path: /jsonComparison"
89−
90
55
91serverSatisfiesSpec :: Spec
56serverSatisfiesSpec :: Spec
92serverSatisfiesSpec = describe "serverSatisfies" $ do
57serverSatisfiesSpec = describe "serverSatisfies" $ do
@@ -108,38 +73,33 @@ serverSatisfiesSpec = describe "serverSatisfies" $ do
108 context "when predicates are false" $ do
73 context "when predicates are false" $ do
109
74
110 it "fails with informative error messages" $ do
75 it "fails with informative error messages" $ do
111− FailedWith err <- withServantServerAndContext api ctx server $ \burl -> do
76+ Fail _ err <- withServantServerAndContext api ctx server $ \burl -> do
112− evalExample $ serverSatisfies api burl args (notAllowedContainsAllowHeader <%> mempty)
77+ evalExample $ serverSatisfies api burl args (getsHaveCacheControlHeader <%> mempty)
113− show err `shouldContain` "notAllowedContainsAllowHeader"
78+ err `shouldContain` "getsHaveCacheControlHeader"
114− show err `shouldContain` "Headers"
79+ err `shouldContain` "Headers"
115− show err `shouldContain` "Body"
80+ err `shouldContain` "Body"
116−
117
81
118onlyJsonObjectSpec :: Spec
82onlyJsonObjectSpec :: Spec
119onlyJsonObjectSpec = describe "onlyJsonObjects" $ do
83onlyJsonObjectSpec = describe "onlyJsonObjects" $ do
120
84
121 it "fails correctly" $ do
85 it "fails correctly" $ do
122− FailedWith err <- withServantServerAndContext api ctx server $ \burl -> do
86+ Fail _ err <- withServantServerAndContext api ctx server $ \burl -> do
123 evalExample $ serverSatisfies (Proxy :: Proxy (Get '[JSON] Int)) burl args
87 evalExample $ serverSatisfies (Proxy :: Proxy (Get '[JSON] Int)) burl args
124 (onlyJsonObjects <%> mempty)
88 (onlyJsonObjects <%> mempty)
125− show err `shouldContain` "onlyJsonObjects"
89+ err `shouldContain` "onlyJsonObjects"
126
90
127 it "accepts non-JSON endpoints" $ do
91 it "accepts non-JSON endpoints" $ do
128 withServantServerAndContext octetAPI ctx serverOctetAPI $ \burl ->
92 withServantServerAndContext octetAPI ctx serverOctetAPI $ \burl ->
129 serverSatisfies octetAPI burl args (onlyJsonObjects <%> mempty)
93 serverSatisfies octetAPI burl args (onlyJsonObjects <%> mempty)
130
94
131− it "does not fail when there is no content-type" $ do
132− withServantServerAndContext api2 ctx serverFailing $ \burl ->
133− serverSatisfies api2 burl args (onlyJsonObjects <%> mempty)
134−
135notLongerThanSpec :: Spec
95notLongerThanSpec :: Spec
136notLongerThanSpec = describe "notLongerThan" $ do
96notLongerThanSpec = describe "notLongerThan" $ do
137
97
138 it "fails correctly" $ do
98 it "fails correctly" $ do
139− FailedWith err <- withServantServerAndContext api ctx server $ \burl -> do
99+ Fail _ err <- withServantServerAndContext api ctx server $ \burl -> do
140 evalExample $ serverSatisfies (Proxy :: Proxy (Get '[JSON] Int)) burl args
100 evalExample $ serverSatisfies (Proxy :: Proxy (Get '[JSON] Int)) burl args
141 (notLongerThan 1 <%> mempty)
101 (notLongerThan 1 <%> mempty)
142− show err `shouldContain` "notLongerThan"
102+ err `shouldContain` "notLongerThan"
143
103
144 it "succeeds correctly" $ do
104 it "succeeds correctly" $ do
145 withServantServerAndContext api ctx server $ \burl ->
105 withServantServerAndContext api ctx server $ \burl ->
@@ -149,82 +109,19 @@ isComprehensiveSpec :: Spec
149isComprehensiveSpec = describe "HasGenRequest" $ do
109isComprehensiveSpec = describe "HasGenRequest" $ do
150
110
151 it "has instances for all 'servant' combinators" $ do
111 it "has instances for all 'servant' combinators" $ do
152− let _g = genRequest comprehensiveAPIWithoutStreamingOrRaw
112+ let _g = genRequest comprehensiveAPIWithoutRaw
153 True `shouldBe` True -- This is a type-level check
113 True `shouldBe` True -- This is a type-level check
154
114
155−deepPathSpec :: Spec
156−deepPathSpec = describe "Path components" $ do
157−
158− it "are separated by slashes, without a trailing slash" $ do
159− let rng = mkQCGen 0
160− burl = BaseUrl Http "localhost" 80 ""
161− gen = runGenRequest deepAPI
162− req = (unGen gen rng 0) burl
163− path req `shouldBe` ("/one/two/three")
164−
165−
166queryParamsSpec :: Spec
115queryParamsSpec :: Spec
167queryParamsSpec = describe "QueryParams" $ do
116queryParamsSpec = describe "QueryParams" $ do
168
117
169 it "reduce to an HTTP query string correctly" $ do
118 it "reduce to an HTTP query string correctly" $ do
170 let rng = mkQCGen 0
119 let rng = mkQCGen 0
171 burl = BaseUrl Http "localhost" 80 ""
120 burl = BaseUrl Http "localhost" 80 ""
172− gen = runGenRequest paramsAPI
121+ gen = genRequest paramsAPI
173− req = (unGen gen rng 0) burl
174− qs = C.unpack $ queryString req
175− qs `shouldBe` "one=_&two=_"
176−
177−queryFlagsSpec :: Spec
178−queryFlagsSpec = describe "QueryFlags" $ do
179−
180− it "reduce to an HTTP query string correctly" $ do
181− let rng = mkQCGen 0
182− burl = BaseUrl Http "localhost" 80 ""
183− gen = runGenRequest flagsAPI
184 req = (unGen gen rng 0) burl
122 req = (unGen gen rng 0) burl
185 qs = C.unpack $ queryString req
123 qs = C.unpack $ queryString req
186− qs `shouldBe` "one&two"
124+ qs `shouldBe` "one=&two="
187−
188−htmlDocTypesSpec :: Spec
189−htmlDocTypesSpec = describe "HtmlDocTypes" $ do
190−
191− it "fails HTML without doctype correctly" $ do
192− err <- withServantServerAndContext docTypeApi ctx noDocTypeServer $ \burl -> do
193− evalExample $ serverSatisfies docTypeApi burl args
194− (htmlIncludesDoctype <%> mempty)
195− show err `shouldContain` "htmlIncludesDoctype"
196−
197− it "passes HTML with a doctype at start" $ do
198− withServantServerAndContext docTypeApi ctx docTypeServer $ \burl ->
199− serverSatisfies docTypeApi burl args (htmlIncludesDoctype <%> mempty)
200−
201− it "accepts json endpoints and passes over them in silence" $ do
202− withServantServerAndContext api ctx server $ \burl -> do
203− serverSatisfies (Proxy :: Proxy (Get '[JSON] Int)) burl args
204− (htmlIncludesDoctype <%> mempty)
205−
206−
207−makeRandomRequest :: Proxy LargeAPI -> BaseUrl -> IO Integer
208−makeRandomRequest large burl = do
209− req <- generate $ runGenRequest large
210− pure $ fst . fromJust . C.readInteger . C.drop 1 . path $ req burl
211−
212−
213−unbiasedGenerationSpec :: Spec
214−unbiasedGenerationSpec = describe "Unbiased Generation of requests" $
215−
216− it "frequency paired with generated endpoint should be more randomly distributed" $ do
217− let burl = BaseUrl Http "localhost" 80 ""
218− let runs = 10000 :: Double
219− someRequests <- replicateM 10000 (makeRandomRequest largeApi burl)
220− let mean = (sum $ map fromIntegral someRequests) / runs
221− let variancer x = let ix = fromIntegral x in (ix - mean) * (ix - mean)
222− let variance = (sum $ map variancer someRequests) / runs - 1
223− -- mean should be around 8.5. If this fails, we likely need more runs (or there's a bug!)
224− mean > 8 `shouldBe` True
225− mean < 9 `shouldBe` True
226− -- Std dev is likely around 4. Variance is probably greater than 20.
227− variance > 19.5 `shouldBe` True
228
125
229------------------------------------------------------------------------------
126------------------------------------------------------------------------------
230-- APIs
127-- APIs
@@ -237,17 +134,11 @@ type API = ReqBody '[JSON] String :> Post '[JSON] String
237api :: Proxy API
134api :: Proxy API
238api = Proxy
135api = Proxy
239
136
240−type ParamsAPI = QueryParam "one" () :> QueryParam "two" () :> Get '[JSON] ()
137+type ParamsAPI = QueryParam "one" String :> QueryParam "two" String :> Get '[JSON] ()
241
138
242paramsAPI :: Proxy ParamsAPI
139paramsAPI :: Proxy ParamsAPI
243paramsAPI = Proxy
140paramsAPI = Proxy
244
141
245−type FlagsAPI = QueryFlag "one" :> QueryFlag "two" :> Get '[JSON] ()
246−
247−flagsAPI :: Proxy FlagsAPI
248−flagsAPI = Proxy
249−
250−
251server :: IO (Server API)
142server :: IO (Server API)
252server = do
143server = do
253 mvar <- newMVar ""
144 mvar <- newMVar ""
@@ -261,57 +152,12 @@ type API2 = "failplz" :> Get '[JSON] Int
261api2 :: Proxy API2
152api2 :: Proxy API2
262api2 = Proxy
153api2 = Proxy
263
154
264−type DeepAPI = "one" :> "two" :> "three":> Get '[JSON] ()
265−
266−deepAPI :: Proxy DeepAPI
267−deepAPI = Proxy
268−
269−
270server2 :: IO (Server API2)
155server2 :: IO (Server API2)
271server2 = return $ return 1
156server2 = return $ return 1
272
157
273server3 :: IO (Server API2)
158server3 :: IO (Server API2)
274server3 = return $ return 2
159server3 = return $ return 2
275
160
276−serverFailing :: IO (Server API2)
277−serverFailing = return . throwError $ err405
278−
279−-- With Doctypes
280−type HtmlDoctype = Get '[HTML] Blaze.Html
281−
282−docTypeApi :: Proxy HtmlDoctype
283−docTypeApi = Proxy
284−
285−docTypeServer :: IO (Server HtmlDoctype)
286−docTypeServer = pure $ pure $ Blaze5.docTypeHtml $ Blaze5.span "Hello Test!"
287−
288−noDocTypeServer :: IO (Server HtmlDoctype)
289−noDocTypeServer = pure $ pure $ Blaze.text "Hello Test!"
290−
291−
292−-- Api for unbiased generation of requests tests
293−largeApi :: Proxy LargeAPI
294−largeApi = Proxy
295−
296−type LargeAPI
297− = "1" :> Get '[JSON] Int
298− :<|> "2" :> Get '[JSON] Int
299− :<|> "3" :> Get '[JSON] Int
300− :<|> "4" :> Get '[JSON] Int
301− :<|> "5" :> Get '[JSON] Int
302− :<|> "6" :> Get '[JSON] Int
303− :<|> "7" :> Get '[JSON] Int
304− :<|> "8" :> Get '[JSON] Int
305− :<|> "9" :> Get '[JSON] Int
306− :<|> "10" :> Get '[JSON] Int
307− :<|> "11" :> Get '[JSON] Int
308− :<|> "12" :> Get '[JSON] Int
309− :<|> "13" :> Get '[JSON] Int
310− :<|> "14" :> Get '[JSON] Int
311− :<|> "15" :> Get '[JSON] Int
312− :<|> "16" :> Get '[JSON] Int
313−
314−
315type OctetAPI = Get '[OctetStream] BS.ByteString
161type OctetAPI = Get '[OctetStream] BS.ByteString
316
162
317octetAPI :: Proxy OctetAPI
163octetAPI :: Proxy OctetAPI
@@ -320,46 +166,17 @@ octetAPI = Proxy
320serverOctetAPI :: IO (Server OctetAPI)
166serverOctetAPI :: IO (Server OctetAPI)
321serverOctetAPI = return $ return "blah"
167serverOctetAPI = return $ return "blah"
322
168
323−type JsonApi = "jsonComparison" :> Get '[OctetStream] BS.ByteString
324−
325−jsonApi :: Proxy JsonApi
326−jsonApi = Proxy
327−
328−jsonServer1 :: IO (Server JsonApi)
329−jsonServer1 = return $ return "{ \"b\": [\"b\"], \"a\": 1 }" -- whitespace, ordering different
330−
331−jsonServer2 :: IO (Server JsonApi)
332−jsonServer2 = return $ return "{\"a\": 1,\"b\":[\"b\"]}"
333−
334−jsonServer3 :: IO (Server JsonApi)
335−jsonServer3 = return $ return "{\"a\": 2, \"b\": [\"b\"]}"
336−
337−jsonServer4 :: IO (Server JsonApi)
338−jsonServer4 = return $ return "{\"c\": 1, \"d\": [\"b\"]}"
339−
340−
341ctx :: Context '[BasicAuthCheck ()]
169ctx :: Context '[BasicAuthCheck ()]
342ctx = BasicAuthCheck (const . return $ NoSuchUser) :. EmptyContext
170ctx = BasicAuthCheck (const . return $ NoSuchUser) :. EmptyContext
343------------------------------------------------------------------------------
171------------------------------------------------------------------------------
344-- Utils
172-- Utils
345------------------------------------------------------------------------------
173------------------------------------------------------------------------------
174+
346−evalExample :: (Example e, Arg e ~ ()) => e -> IO EvalResult
175+evalExample :: (Example e, Arg e ~ ()) => e -> IO Result
347−evalExample e = do
348− r <- safeEvaluateExample e defaultParams ($ ()) progCallback
176+evalExample e = evaluateExample e defaultParams ($ ()) progCallback
349− case resultStatus r of
350− Success -> return $ AllGood
351− Failure _ reason -> return $ FailedWith $ show reason
352− Pending {} -> error "should not happen"
353 where
177 where
354 progCallback _ = return ()
178 progCallback _ = return ()
355
179
356−data EvalResult
357− = AnException SomeException
358− | AllGood
359− | FailedWith String
360− deriving (Show)
361−
362−
363args :: Args
180args :: Args
364args = defaultArgs { maxSuccess = noOfTestCases }
181args = defaultArgs { maxSuccess = noOfTestCases }
365
182
@@ -369,3 +186,8 @@ noOfTestCases = 20000
369#else
186#else
370noOfTestCases = 1000
187noOfTestCases = 1000
371#endif
188#endif
189+
190+#if !MIN_VERSION_servant(0,8,0)
191+comprehensiveAPIWithoutRaw :: Proxy ComprehensiveAPI
192+comprehensiveAPIWithoutRaw = comprehensiveAPI
193+#endif