jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a few more tests fixed (2)

Browse Source
This commit is contained in:
Ruslan Talpa
2015-10-22 17:03:06 +03:00
parent 2662e24991
commit ca4014f751
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PostgREST/PgQuery.hs
+1 -1
View File
@@ -337,7 +337,7 @@ countF :: T.Text
countF = "pg_catalog.count(t)" countF = "pg_catalog.count(t)"
countAllF :: T.Text countAllF :: T.Text
countAllF = "(SELECT pg_catalog.count(a) FROM (SELECT * FROM source) a )" countAllF = "(SELECT pg_catalog.count(1) FROM (SELECT * FROM source) a )"
countNoneF :: T.Text countNoneF :: T.Text
countNoneF = "null" countNoneF = "null"
test/Feature/InsertSpec.hs
+6 -6
View File
@@ -121,12 +121,12 @@ spec = afterAll_ resetDb $ around withApp $ do
after_ (clearTable "no_pk") . context "requesting full representation" $ do after_ (clearTable "no_pk") . context "requesting full representation" $ do
it "returns full details of inserted record" $ it "returns full details of inserted record" $
request methodPost "/no_pk" request methodPost "/no_pk"
[("Content-Type", "text/csv"), ("Prefer", "return=representation")] [("Content-Type", "text/csv"), ("Accept", "text/csv"), ("Prefer", "return=representation")]
"a,b\nbar,baz" "a,b\nbar,baz"
`shouldRespondWith` ResponseMatcher { `shouldRespondWith` ResponseMatcher {
matchBody = Just [json| { "a":"bar", "b":"baz" } |] matchBody = Just "a,b\rbar,baz"
, matchStatus = 201 , matchStatus = 201
, matchHeaders = ["Content-Type" <:> "application/json", , matchHeaders = ["Content-Type" <:> "text/csv",
"Location" <:> "/no_pk?a=eq.bar&b=eq.baz"] "Location" <:> "/no_pk?a=eq.bar&b=eq.baz"]
} }
@@ -146,7 +146,7 @@ spec = afterAll_ resetDb $ around withApp $ do
[("Content-Type", "text/csv"), ("Accept", "text/csv"), ("Prefer", "return=representation")] [("Content-Type", "text/csv"), ("Accept", "text/csv"), ("Prefer", "return=representation")]
"a,b\nNULL,foo" "a,b\nNULL,foo"
`shouldRespondWith` ResponseMatcher { `shouldRespondWith` ResponseMatcher {
matchBody = Just "a,b\n,foo" matchBody = Just "a,b\r,foo"
, matchStatus = 201 , matchStatus = 201
, matchHeaders = ["Content-Type" <:> "text/csv", , matchHeaders = ["Content-Type" <:> "text/csv",
"Location" <:> "/no_pk?a=is.null&b=eq.foo"] "Location" <:> "/no_pk?a=is.null&b=eq.foo"]
@@ -303,7 +303,7 @@ spec = afterAll_ resetDb $ around withApp $ do
[ authHeaderBasic "jdoe" "1234", ("Prefer", "return=representation") ] [ authHeaderBasic "jdoe" "1234", ("Prefer", "return=representation") ]
[json| { "secret": "nyancat" } |] [json| { "secret": "nyancat" } |]
liftIO $ do liftIO $ do
simpleBody p1 `shouldBe` [json| { "owner":"jdoe", "secret":"nyancat" } |] simpleBody p1 `shouldBe` [str|{"owner":"jdoe","secret":"nyancat"}|]
simpleStatus p1 `shouldBe` created201 simpleStatus p1 `shouldBe` created201
p2 <- request methodPost "/authors_only" p2 <- request methodPost "/authors_only"
@@ -311,5 +311,5 @@ spec = afterAll_ resetDb $ around withApp $ do
[ authHeaderJWT "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoicG9zdGdyZXN0X3Rlc3RfYXV0aG9yIiwiaWQiOiJqcm9lIn0.YuF_VfmyIxWyuceT7crnNKEprIYXsJAyXid3rjPjIow", ("Prefer", "return=representation") ] [ authHeaderJWT "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoicG9zdGdyZXN0X3Rlc3RfYXV0aG9yIiwiaWQiOiJqcm9lIn0.YuF_VfmyIxWyuceT7crnNKEprIYXsJAyXid3rjPjIow", ("Prefer", "return=representation") ]
[json| { "secret": "lolcat", "owner": "hacker" } |] [json| { "secret": "lolcat", "owner": "hacker" } |]
liftIO $ do liftIO $ do
simpleBody p2 `shouldBe` [json| { "owner":"jroe", "secret":"lolcat" } |] simpleBody p2 `shouldBe` [str|{"owner":"jroe","secret":"lolcat"}|]
simpleStatus p2 `shouldBe` created201 simpleStatus p2 `shouldBe` created201