git.iko.soy/servant-quickcheck
on master help sign in
Merge branch 'master' into support-servant-0.15
eb3cdbcJulian Arni
.travis.yml+55−50
@@ -1,12 +1,14 @@
1# This Travis job script has been generated by a script via
1# This Travis job script has been generated by a script via
2#
2#
3−# haskell-ci '--branches' 'master' '-o' '.travis.yml' 'servant-quickcheck.cabal'
3+# haskell-ci '--config=cabal.haskell-ci' 'servant-quickcheck.cabal'
4#
4#
5# For more information, see https://github.com/haskell-CI/haskell-ci
5# For more information, see https://github.com/haskell-CI/haskell-ci
6#
6#
7−# version: 0.3.20190413
7+# version: 0.9.20200121
8#
8#
9+version: ~> 1.0
9language: c
10language: c
11+os: linux
10dist: xenial
12dist: xenial
11git:
13git:
12 # whether to recursively clone submodules
14 # whether to recursively clone submodules
@@ -18,6 +20,7 @@ cache:
18 directories:
20 directories:
19 - $HOME/.cabal/packages
21 - $HOME/.cabal/packages
20 - $HOME/.cabal/store
22 - $HOME/.cabal/store
23+ - $HOME/.hlint
21before_cache:
24before_cache:
22 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
25 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
23 # remove files that are regenerated by 'cabal update'
26 # remove files that are regenerated by 'cabal update'
@@ -27,67 +30,63 @@ before_cache:
27 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
30 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
28 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
31 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
29 - rm -rfv $CABALHOME/packages/head.hackage
32 - rm -rfv $CABALHOME/packages/head.hackage
30−matrix:
33+jobs:
31 include:
34 include:
32− - compiler: ghc-8.6.4
35+ - compiler: ghc-8.8.1
33− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.4","cabal-install-2.4"]}}
36+ 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.1","cabal-install-3.0"]}}
37+ os: linux
38+ - compiler: ghc-8.6.5
39+ 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.0"]}}
40+ os: linux
34 - compiler: ghc-8.4.4
41 - compiler: ghc-8.4.4
35− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
42+ 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.0"]}}
43+ os: linux
36 - compiler: ghc-8.2.2
44 - compiler: ghc-8.2.2
37− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
45+ 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.0"]}}
46+ os: linux
38 - compiler: ghc-8.0.2
47 - compiler: ghc-8.0.2
39− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
48+ 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.0"]}}
49+ os: linux
40before_install:
50before_install:
41 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
51 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
52+ - WITHCOMPILER="-w $HC"
53+ - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
42 - HCPKG="$HC-pkg"
54 - HCPKG="$HC-pkg"
43 - unset CC
55 - unset CC
44 - CABAL=/opt/ghc/bin/cabal
56 - CABAL=/opt/ghc/bin/cabal
45 - CABALHOME=$HOME/.cabal
57 - CABALHOME=$HOME/.cabal
46 - export PATH="$CABALHOME/bin:$PATH"
58 - export PATH="$CABALHOME/bin:$PATH"
47 - TOP=$(pwd)
59 - TOP=$(pwd)
48− - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
60+ - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
49 - echo $HCNUMVER
61 - echo $HCNUMVER
50− - CABAL="$CABAL -vnormal+nowrap+markoutput"
62+ - CABAL="$CABAL -vnormal+nowrap"
51 - set -o pipefail
63 - set -o pipefail
52− - |
53− echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
54− echo 'BEGIN { state = "output"; }' >> .colorful.awk
55− echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
56− echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
57− echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
58− echo ' if (state == "cabal") {' >> .colorful.awk
59− echo ' print blue($0)' >> .colorful.awk
60− echo ' } else {' >> .colorful.awk
61− echo ' print $0' >> .colorful.awk
62− echo ' }' >> .colorful.awk
63− echo '}' >> .colorful.awk
64− - cat .colorful.awk
65− - |
66− color_cabal_output () {
67− awk -f $TOP/.colorful.awk
68− }
69− - echo text | color_cabal_output
70−install:
71− - ${CABAL} --version
72− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
73 - TEST=--enable-tests
64 - TEST=--enable-tests
74 - BENCH=--enable-benchmarks
65 - BENCH=--enable-benchmarks
75− - GHCHEAD=${GHCHEAD-false}
66+ - HEADHACKAGE=false
76 - rm -f $CABALHOME/config
67 - rm -f $CABALHOME/config
77 - |
68 - |
78 echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
69 echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
79 echo "remote-build-reporting: anonymous" >> $CABALHOME/config
70 echo "remote-build-reporting: anonymous" >> $CABALHOME/config
71+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
80 echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
72 echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
81 echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
73 echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
82 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
74 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
83 echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
75 echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
84 echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
76 echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
77+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
85 echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
78 echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
86 echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
79 echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
87 echo "install-dirs user" >> $CABALHOME/config
80 echo "install-dirs user" >> $CABALHOME/config
88 echo " prefix: $CABALHOME" >> $CABALHOME/config
81 echo " prefix: $CABALHOME" >> $CABALHOME/config
89 echo "repository hackage.haskell.org" >> $CABALHOME/config
82 echo "repository hackage.haskell.org" >> $CABALHOME/config
90 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
83 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
84+install:
85+ - ${CABAL} --version
86+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
87+ - |
88+ echo "program-default-options" >> $CABALHOME/config
89+ echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
91 - cat $CABALHOME/config
90 - cat $CABALHOME/config
92 - rm -fv cabal.project cabal.project.local cabal.project.freeze
91 - rm -fv cabal.project cabal.project.local cabal.project.freeze
93 - travis_retry ${CABAL} v2-update -v
92 - travis_retry ${CABAL} v2-update -v
@@ -95,51 +94,57 @@ install:
95 - rm -rf cabal.project cabal.project.local cabal.project.freeze
94 - rm -rf cabal.project cabal.project.local cabal.project.freeze
96 - touch cabal.project
95 - touch cabal.project
97 - |
96 - |
98− echo 'packages: "."' >> cabal.project
97+ echo "packages: ." >> cabal.project
99 - |
98 - |
100− echo "write-ghc-environment-files: always" >> cabal.project
101− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(servant-quickcheck)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
99+ - "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"
102 - cat cabal.project || true
100 - cat cabal.project || true
103 - cat cabal.project.local || true
101 - cat cabal.project.local || true
104 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
102 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
105− - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
103+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
106 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
104 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
107 - rm cabal.project.freeze
105 - rm cabal.project.freeze
108− - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
106+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
109− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
107+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
110script:
108script:
111 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
109 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
112 # Packaging...
110 # Packaging...
113− - ${CABAL} v2-sdist all | color_cabal_output
111+ - ${CABAL} v2-sdist all
114 # Unpacking...
112 # Unpacking...
115 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
113 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
116 - cd ${DISTDIR} || false
114 - cd ${DISTDIR} || false
117− - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
115+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
116+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
117+ - PKGDIR_servant_quickcheck="$(find . -maxdepth 1 -type d -regex '.*/servant-quickcheck-[0-9.]*')"
118 # Generate cabal.project
118 # Generate cabal.project
119 - rm -rf cabal.project cabal.project.local cabal.project.freeze
119 - rm -rf cabal.project cabal.project.local cabal.project.freeze
120 - touch cabal.project
120 - touch cabal.project
121 - |
121 - |
122− echo 'packages: "servant-quickcheck-*/*.cabal"' >> cabal.project
122+ echo "packages: ${PKGDIR_servant_quickcheck}" >> cabal.project
123 - |
123 - |
124− echo "write-ghc-environment-files: always" >> cabal.project
125− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(servant-quickcheck)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
124+ - "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"
126 - cat cabal.project || true
125 - cat cabal.project || true
127 - cat cabal.project.local || true
126 - cat cabal.project.local || true
128 # Building...
127 # Building...
129 # this builds all libraries and executables (without tests/benchmarks)
128 # this builds all libraries and executables (without tests/benchmarks)
130− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
129+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
131 # Building with tests and benchmarks...
130 # Building with tests and benchmarks...
132 # build & run tests, build benchmarks
131 # build & run tests, build benchmarks
133− - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
132+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
134 # Testing...
133 # Testing...
135− - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
134+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
136 # cabal check...
135 # cabal check...
137− - (cd servant-quickcheck-* && ${CABAL} -vnormal check)
136+ - (cd ${PKGDIR_servant_quickcheck} && ${CABAL} -vnormal check)
138 # haddock...
137 # haddock...
139− - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
138+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
140 # Building without installed constraints for packages in global-db...
139 # Building without installed constraints for packages in global-db...
141 - rm -f cabal.project.local
140 - rm -f cabal.project.local
141+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
142+ # Constraint sets
143+ - rm -rf cabal.project.local
144+ # Constraint set base-compat-0.10
142− - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
145+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.10.*' all
146+ # Constraint set base-compat-0.11
147+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all
143
148
144−# REGENDATA ["--branches","master","-o",".travis.yml","servant-quickcheck.cabal"]
149+# REGENDATA ("0.9.20200121",["--config=cabal.haskell-ci","servant-quickcheck.cabal"])
145# EOF
150# EOF
CHANGELOG.yaml+5
@@ -1,4 +1,9 @@
1releases:
1releases:
2+ - version: "0.0.8.0"
3+ changes:
4+ - description: Support for servant-0.17
5+ authors: phadej
6+ date: 2019-01-23
2
7
3 - version: "0.0.7.3"
8 - version: "0.0.7.3"
4 changes:
9 changes:
cabal.haskell-cinew file+7
@@ -0,0 +1,7 @@
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.projectnew file+2
@@ -0,0 +1,2 @@
1+packages: .
2+tests: true
servant-quickcheck.cabal+13−13
@@ -1,5 +1,5 @@
1name: servant-quickcheck
1name: servant-quickcheck
2−version: 0.0.7.4
2+version: 0.0.8.0
3synopsis: QuickCheck entire APIs
3synopsis: 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
@@ -13,7 +13,7 @@ category: Web
13build-type: Simple
13build-type: Simple
14cabal-version: >=1.10
14cabal-version: >=1.10
15extra-source-files: CHANGELOG.yaml
15extra-source-files: CHANGELOG.yaml
16−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.4
16+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || == 8.8.1
17
17
18source-repository head
18source-repository head
19 type: git
19 type: git
@@ -35,32 +35,32 @@ library
35
35
36 build-depends:
36 build-depends:
37 aeson >=0.8 && <2
37 aeson >=0.8 && <2
38− , base >=4.9 && <4.13
38+ , base >=4.9 && <4.15
39− , base-compat-batteries >=0.10.1 && <0.11
39+ , base-compat-batteries >=0.10.1 && <0.12
40 , bytestring >=0.10 && <0.11
40 , bytestring >=0.10 && <0.11
41 , case-insensitive >=1.2 && <1.3
41 , case-insensitive >=1.2 && <1.3
42− , clock >=0.7 && <0.8
42+ , clock >=0.7 && <0.9
43 , data-default-class >=0.0 && <0.2
43 , data-default-class >=0.0 && <0.2
44 , hspec >=2.5.6 && <2.8
44 , hspec >=2.5.6 && <2.8
45− , http-client >=0.4.30 && <0.7
45+ , http-client >=0.4.30 && <0.8
46 , http-media >=0.6 && <0.9
46 , http-media >=0.6 && <0.9
47 , http-types >=0.8 && <0.13
47 , http-types >=0.8 && <0.13
48 , mtl >=2.1 && <2.3
48 , mtl >=2.1 && <2.3
49 , pretty >=1.1 && <1.2
49 , pretty >=1.1 && <1.2
50 , process >=1.2 && <1.7
50 , process >=1.2 && <1.7
51− , QuickCheck >=2.7 && <2.14
51+ , QuickCheck >=2.7 && <2.15
52− , servant >=0.15 && <0.17
52+ , servant >=0.15 && <0.18
53− , servant-client >=0.15 && <0.17
53+ , servant-client >=0.15 && <0.18
54− , servant-server >=0.15 && <0.17
54+ , servant-server >=0.15 && <0.18
55 , split >=0.2 && <0.3
55 , split >=0.2 && <0.3
56 , string-conversions >=0.3 && <0.5
56 , string-conversions >=0.3 && <0.5
57 , temporary >=1.2 && <1.4
57 , temporary >=1.2 && <1.4
58 , text >=1 && <2
58 , text >=1 && <2
59− , time >=1.5 && <1.9
59+ , time >=1.5 && <1.11
60− , warp >=3.2.4 && <3.3
60+ , warp >=3.2.4 && <3.4
61
61
62 if !impl(ghc >=8.0)
62 if !impl(ghc >=8.0)
63− build-depends: semigroups >=0.18.3 && <0.19
63+ build-depends: semigroups >=0.18.3 && <0.20
64
64
65 hs-source-dirs: src
65 hs-source-dirs: src
66 default-extensions:
66 default-extensions:
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