git.iko.soy/servant-quickcheck
on master help sign in
.travis.yml+40−42
since splitsnapshots
unifiedsplit
@@ -2,11 +2,17 @@
2#
2#
3# haskell-ci '--config=cabal.haskell-ci' 'servant-quickcheck.cabal'
3# haskell-ci '--config=cabal.haskell-ci' 'servant-quickcheck.cabal'
4#
4#
5+# To regenerate the script (for example after adjusting tested-with) run
6+#
7+# haskell-ci regenerate
8+#
5# For more information, see https://github.com/haskell-CI/haskell-ci
9# For more information, see https://github.com/haskell-CI/haskell-ci
6#
10#
7−# version: 0.5.20190908
11+# version: 0.10.1
8#
12#
13+version: ~> 1.0
9language: c
14language: c
15+os: linux
10dist: xenial
16dist: xenial
11git:
17git:
12 # whether to recursively clone submodules
18 # whether to recursively clone submodules
@@ -18,6 +24,7 @@ cache:
18 directories:
24 directories:
19 - $HOME/.cabal/packages
25 - $HOME/.cabal/packages
20 - $HOME/.cabal/store
26 - $HOME/.cabal/store
27+ - $HOME/.hlint
21before_cache:
28before_cache:
22 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
29 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
23 # remove files that are regenerated by 'cabal update'
30 # remove files that are regenerated by 'cabal update'
@@ -27,18 +34,23 @@ before_cache:
27 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
34 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
28 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
35 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
29 - rm -rfv $CABALHOME/packages/head.hackage
36 - rm -rfv $CABALHOME/packages/head.hackage
30−matrix:
37+jobs:
31 include:
38 include:
32− - compiler: ghc-8.8.1
39+ - compiler: ghc-8.8.3
33− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
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
34 - compiler: ghc-8.6.5
42 - compiler: ghc-8.6.5
35− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
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
36 - compiler: ghc-8.4.4
45 - compiler: ghc-8.4.4
37− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
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
38 - compiler: ghc-8.2.2
48 - compiler: ghc-8.2.2
39− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
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
40 - compiler: ghc-8.0.2
51 - compiler: ghc-8.0.2
41− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
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
42before_install:
54before_install:
43 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
55 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
44 - WITHCOMPILER="-w $HC"
56 - WITHCOMPILER="-w $HC"
@@ -51,29 +63,8 @@ before_install:
51 - TOP=$(pwd)
63 - TOP=$(pwd)
52 - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
64 - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
53 - echo $HCNUMVER
65 - echo $HCNUMVER
54− - CABAL="$CABAL -vnormal+nowrap+markoutput"
66+ - CABAL="$CABAL -vnormal+nowrap"
55 - set -o pipefail
67 - set -o pipefail
56− - |
57− echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
58− echo 'BEGIN { state = "output"; }' >> .colorful.awk
59− echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
60− echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
61− echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
62− echo ' if (state == "cabal") {' >> .colorful.awk
63− echo ' print blue($0)' >> .colorful.awk
64− echo ' } else {' >> .colorful.awk
65− echo ' print $0' >> .colorful.awk
66− echo ' }' >> .colorful.awk
67− echo '}' >> .colorful.awk
68− - cat .colorful.awk
69− - |
70− color_cabal_output () {
71− awk -f $TOP/.colorful.awk
72− }
73− - echo text | color_cabal_output
74−install:
75− - ${CABAL} --version
76− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
77 - TEST=--enable-tests
68 - TEST=--enable-tests
78 - BENCH=--enable-benchmarks
69 - BENCH=--enable-benchmarks
79 - HEADHACKAGE=false
70 - HEADHACKAGE=false
@@ -94,6 +85,9 @@ install:
94 echo " prefix: $CABALHOME" >> $CABALHOME/config
85 echo " prefix: $CABALHOME" >> $CABALHOME/config
95 echo "repository hackage.haskell.org" >> $CABALHOME/config
86 echo "repository hackage.haskell.org" >> $CABALHOME/config
96 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
87 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
88+install:
89+ - ${CABAL} --version
90+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
97 - |
91 - |
98 echo "program-default-options" >> $CABALHOME/config
92 echo "program-default-options" >> $CABALHOME/config
99 echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
93 echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
@@ -105,20 +99,22 @@ install:
105 - touch cabal.project
99 - touch cabal.project
106 - |
100 - |
107 echo "packages: ." >> cabal.project
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"
108 - |
104 - |
109 - "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"
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"
110 - cat cabal.project || true
106 - cat cabal.project || true
111 - cat cabal.project.local || true
107 - cat cabal.project.local || true
112 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
108 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
113− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
109+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
114 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
110 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
115 - rm cabal.project.freeze
111 - rm cabal.project.freeze
116− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
112+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
117− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
113+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
118script:
114script:
119 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
115 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
120 # Packaging...
116 # Packaging...
121− - ${CABAL} v2-sdist all | color_cabal_output
117+ - ${CABAL} v2-sdist all
122 # Unpacking...
118 # Unpacking...
123 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
119 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
124 - cd ${DISTDIR} || false
120 - cd ${DISTDIR} || false
@@ -130,31 +126,33 @@ script:
130 - touch cabal.project
126 - touch cabal.project
131 - |
127 - |
132 echo "packages: ${PKGDIR_servant_quickcheck}" >> cabal.project
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"
133 - |
131 - |
134 - "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"
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"
135 - cat cabal.project || true
133 - cat cabal.project || true
136 - cat cabal.project.local || true
134 - cat cabal.project.local || true
137 # Building...
135 # Building...
138 # this builds all libraries and executables (without tests/benchmarks)
136 # this builds all libraries and executables (without tests/benchmarks)
139− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
137+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
140 # Building with tests and benchmarks...
138 # Building with tests and benchmarks...
141 # build & run tests, build benchmarks
139 # build & run tests, build benchmarks
142− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
140+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
143 # Testing...
141 # Testing...
144− - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
142+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
145 # cabal check...
143 # cabal check...
146 - (cd ${PKGDIR_servant_quickcheck} && ${CABAL} -vnormal check)
144 - (cd ${PKGDIR_servant_quickcheck} && ${CABAL} -vnormal check)
147 # haddock...
145 # haddock...
148− - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
146+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
149 # Building without installed constraints for packages in global-db...
147 # Building without installed constraints for packages in global-db...
150 - rm -f cabal.project.local
148 - rm -f cabal.project.local
151− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
149+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
152 # Constraint sets
150 # Constraint sets
153 - rm -rf cabal.project.local
151 - rm -rf cabal.project.local
154 # Constraint set base-compat-0.10
152 # Constraint set base-compat-0.10
155− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.10.*' all | color_cabal_output
153+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.10.*' all
156 # Constraint set base-compat-0.11
154 # Constraint set base-compat-0.11
157− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all | color_cabal_output
155+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all
158
156
159−# REGENDATA ["--config=cabal.haskell-ci","servant-quickcheck.cabal"]
157+# REGENDATA ("0.10.1",["--config=cabal.haskell-ci","servant-quickcheck.cabal"])
160# EOF
158# EOF
CHANGELOG.yaml+15
@@ -1,4 +1,19 @@
1releases:
1releases:
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
2
17
3 - version: "0.0.7.3"
18 - version: "0.0.7.3"
4 changes:
19 changes:
cabal.project+2
@@ -1,2 +1,4 @@
1packages: .
1packages: .
2tests: true
2tests: true
3+
4+allow-newer: servant-blaze:servant
servant-quickcheck.cabal+9−10
@@ -1,6 +1,5 @@
1name: servant-quickcheck
1name: servant-quickcheck
2−version: 0.0.7.4
2+version: 0.0.9.1
3−x-revision: 1
4synopsis: QuickCheck entire APIs
3synopsis: QuickCheck entire APIs
5description:
4description:
6 This packages provides QuickCheck properties that are tested across an entire
5 This packages provides QuickCheck properties that are tested across an entire
@@ -14,7 +13,7 @@ category: Web
14build-type: Simple
13build-type: Simple
15cabal-version: >=1.10
14cabal-version: >=1.10
16extra-source-files: CHANGELOG.yaml
15extra-source-files: CHANGELOG.yaml
17−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || == 8.8.1
16+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || == 8.8.3
18
17
19source-repository head
18source-repository head
20 type: git
19 type: git
@@ -36,28 +35,28 @@ library
36
35
37 build-depends:
36 build-depends:
38 aeson >=0.8 && <2
37 aeson >=0.8 && <2
39− , base >=4.9 && <4.14
38+ , base >=4.9 && <4.15
40 , base-compat-batteries >=0.10.1 && <0.12
39 , base-compat-batteries >=0.10.1 && <0.12
41 , bytestring >=0.10 && <0.11
40 , bytestring >=0.10 && <0.11
42 , case-insensitive >=1.2 && <1.3
41 , case-insensitive >=1.2 && <1.3
43 , clock >=0.7 && <0.9
42 , clock >=0.7 && <0.9
44 , data-default-class >=0.0 && <0.2
43 , data-default-class >=0.0 && <0.2
45 , hspec >=2.5.6 && <2.8
44 , hspec >=2.5.6 && <2.8
46− , http-client >=0.4.30 && <0.7
45+ , http-client >=0.4.30 && <0.8
47 , http-media >=0.6 && <0.9
46 , http-media >=0.6 && <0.9
48 , http-types >=0.8 && <0.13
47 , http-types >=0.8 && <0.13
49 , mtl >=2.1 && <2.3
48 , mtl >=2.1 && <2.3
50 , pretty >=1.1 && <1.2
49 , pretty >=1.1 && <1.2
51 , process >=1.2 && <1.7
50 , process >=1.2 && <1.7
52− , QuickCheck >=2.7 && <2.14
51+ , QuickCheck >=2.7 && <2.15
53− , servant >=0.16 && <0.17
52+ , servant >=0.17 && <0.19
54− , servant-client >=0.16 && <0.17
53+ , servant-client >=0.17 && <0.19
55− , servant-server >=0.16 && <0.17
54+ , servant-server >=0.17 && <0.19
56 , split >=0.2 && <0.3
55 , split >=0.2 && <0.3
57 , string-conversions >=0.3 && <0.5
56 , string-conversions >=0.3 && <0.5
58 , temporary >=1.2 && <1.4
57 , temporary >=1.2 && <1.4
59 , text >=1 && <2
58 , text >=1 && <2
60− , time >=1.5 && <1.10
59+ , time >=1.5 && <1.11
61 , warp >=3.2.4 && <3.4
60 , warp >=3.2.4 && <3.4
62
61
63 if !impl(ghc >=8.0)
62 if !impl(ghc >=8.0)
src/Servant/QuickCheck/Internal/HasGenRequest.hs+9−6
@@ -63,18 +63,14 @@ instance (KnownSymbol path, HasGenRequest b) => HasGenRequest (path :> b) where
63 (oldf, old) = genRequest (Proxy :: Proxy b)
63 (oldf, old) = genRequest (Proxy :: Proxy b)
64 new = cs $ symbolVal (Proxy :: Proxy path)
64 new = cs $ symbolVal (Proxy :: Proxy path)
65
65
66−#if MIN_VERSION_servant(0,11,0)
67instance HasGenRequest EmptyAPI where
66instance HasGenRequest EmptyAPI where
68 genRequest _ = (0, error "EmptyAPIs cannot be queried.")
67 genRequest _ = (0, error "EmptyAPIs cannot be queried.")
69−#endif
70
68
71−#if MIN_VERSION_servant(0,12,0)
72instance HasGenRequest api => HasGenRequest (Summary d :> api) where
69instance HasGenRequest api => HasGenRequest (Summary d :> api) where
73 genRequest _ = genRequest (Proxy :: Proxy api)
70 genRequest _ = genRequest (Proxy :: Proxy api)
74
71
75instance HasGenRequest api => HasGenRequest (Description d :> api) where
72instance HasGenRequest api => HasGenRequest (Description d :> api) where
76 genRequest _ = genRequest (Proxy :: Proxy api)
73 genRequest _ = genRequest (Proxy :: Proxy api)
77−#endif
78
74
79instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
75instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
80 => HasGenRequest (Capture' mods x c :> b) where
76 => HasGenRequest (Capture' mods x c :> b) where
@@ -86,7 +82,6 @@ instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
86 (oldf, old) = genRequest (Proxy :: Proxy b)
82 (oldf, old) = genRequest (Proxy :: Proxy b)
87 new = arbitrary :: Gen c
83 new = arbitrary :: Gen c
88
84
89−#if MIN_VERSION_servant(0,8,0)
90instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
85instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
91 => HasGenRequest (CaptureAll x c :> b) where
86 => HasGenRequest (CaptureAll x c :> b) where
92 genRequest _ = (oldf, do
87 genRequest _ = (oldf, do
@@ -97,7 +92,6 @@ instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
97 where
92 where
98 (oldf, old) = genRequest (Proxy :: Proxy b)
93 (oldf, old) = genRequest (Proxy :: Proxy b)
99 new = arbitrary :: Gen [c]
94 new = arbitrary :: Gen [c]
100−#endif
101
95
102instance (Arbitrary c, KnownSymbol h, HasGenRequest b, ToHttpApiData c)
96instance (Arbitrary c, KnownSymbol h, HasGenRequest b, ToHttpApiData c)
103 => HasGenRequest (Header' mods h c :> b) where
97 => HasGenRequest (Header' mods h c :> b) where
@@ -174,6 +168,15 @@ instance (ReflectMethod method)
174 , method = reflectMethod (Proxy :: Proxy method)
168 , method = reflectMethod (Proxy :: Proxy method)
175 })
169 })
176
170
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+
177instance (HasGenRequest a) => HasGenRequest (RemoteHost :> a) where
180instance (HasGenRequest a) => HasGenRequest (RemoteHost :> a) where
178 genRequest _ = genRequest (Proxy :: Proxy a)
181 genRequest _ = genRequest (Proxy :: Proxy a)
179
182
src/Servant/QuickCheck/Internal/QuickCheck.hs+7
@@ -11,6 +11,9 @@ 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
14import Servant.Client (BaseUrl (..), Scheme (..))
17import Servant.Client (BaseUrl (..), Scheme (..))
15import System.IO.Unsafe (unsafePerformIO)
18import System.IO.Unsafe (unsafePerformIO)
16import Test.Hspec (Expectation, expectationFailure)
19import Test.Hspec (Expectation, expectationFailure)
@@ -37,7 +40,11 @@ withServantServer api = withServantServerAndContext api EmptyContext
37-- application.
40-- application.
38--
41--
39-- /Since 0.0.0.0/
42-- /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
40withServantServerAndContext :: HasServer a ctx
46withServantServerAndContext :: HasServer a ctx
47+#endif
41 => Proxy a -> Context ctx -> IO (Server a) -> (BaseUrl -> IO r) -> IO r
48 => Proxy a -> Context ctx -> IO (Server a) -> (BaseUrl -> IO r) -> IO r
42withServantServerAndContext api ctx server t
49withServantServerAndContext api ctx server t
43 = withApplication (return . serveWithContext api ctx =<< server) $ \port ->
50 = withApplication (return . serveWithContext api ctx =<< server) $ \port ->