git.iko.soy/typeable/servant
on master help sign in
Merge pull request #1397 from akhesaCaro/compiling_sqlite_simple_cookbook

Fixing Servant cookbooks part 1 (-testing + sqlite-simple)

commit53e943b5bbc4fb929cbe5c299cc8a15bae8c102d authorGaël Deest <gael.deest@tweag.io> dateThu 18 Mar 2021, 11:09 (6 years ago) parenta74d9d9269e546
3 files changed+7−7
compare with master
unifiedsplit
cabal.project+1−4 doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1 servant-docs/test/Servant/DocsSpec.hs+5−2
cabal.project+1−4
@@ -26,7 +26,7 @@ packages:
2626 doc/cookbook/custom-errors
2727 doc/cookbook/basic-streaming
2828 doc/cookbook/db-postgres-pool
29− -- doc/cookbook/db-sqlite-simple
29+ doc/cookbook/db-sqlite-simple
3030 doc/cookbook/file-upload
3131 doc/cookbook/generic
3232 -- doc/cookbook/hoist-server-with-context
@@ -54,9 +54,6 @@ constraints:
5454constraints: base-compat ^>=0.11
5555constraints: semigroups ^>=0.19
5656
57−-- MonadFail
58−-- https://github.com/nurpax/sqlite-simple/issues/74
59−constraints: sqlite-simple < 0
6057-- allow-newer: sqlite-simple-0.4.16.0:semigroups
6158-- allow-newer: direct-sqlite-2.3.24:semigroups
6259
doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1
@@ -23,7 +23,7 @@ executable cookbook-db-sqlite-simple
2323 , http-types >= 0.12
2424 , markdown-unlit >= 0.4
2525 , http-client >= 0.5
26− , sqlite-simple >= 0.4
26+ , sqlite-simple >= 0.4.5.0
2727 , transformers
2828 default-language: Haskell2010
2929 ghc-options: -Wall -pgmL markdown-unlit
servant-docs/test/Servant/DocsSpec.hs+5−2
@@ -126,8 +126,11 @@ spec = describe "Servant.Docs" $ do
126126 it "mentions headers" $ do
127127 md `shouldContain` "- This endpoint is sensitive to the value of the **X-Test** HTTP header."
128128
129− it "contains response samples" $
130− md `shouldContain` "{\"dt1field1\":\"field 1\",\"dt1field2\":13}"
129+ it "contains response samples - dt1field1" $
130+ md `shouldContain` "\"dt1field1\":\"field 1\""
131+ it "contains response samples - dt1field2" $
132+ md `shouldContain` "\"dt1field2\":13"
133+
131134 it "contains request body samples" $
132135 md `shouldContain` "17"
133136