Change JSON content type to add the charset
This commit is contained in:
parent
6d0aa92517
commit
7793b52d23
4 changed files with 14 additions and 6 deletions
|
@ -173,7 +173,7 @@ verbSpec = describe "Servant.API.Verb" $ do
|
||||||
it "sets the Content-Type header" $ do
|
it "sets the Content-Type header" $ do
|
||||||
response <- THW.request method "" [] ""
|
response <- THW.request method "" [] ""
|
||||||
liftIO $ simpleHeaders response `shouldContain`
|
liftIO $ simpleHeaders response `shouldContain`
|
||||||
[("Content-Type", "application/json")]
|
[("Content-Type", "application/json;charset=utf-8")]
|
||||||
|
|
||||||
test "GET 200" get200 methodGet 200
|
test "GET 200" get200 methodGet 200
|
||||||
test "POST 210" post210 methodPost 210
|
test "POST 210" post210 methodPost 210
|
||||||
|
|
|
@ -12,6 +12,12 @@
|
||||||
([#345](https://github.com/haskell-servant/servant/pull/345))
|
([#345](https://github.com/haskell-servant/servant/pull/345))
|
||||||
([#305](https://github.com/haskell-servant/servant/issues/305))
|
([#305](https://github.com/haskell-servant/servant/issues/305))
|
||||||
|
|
||||||
|
* Default JSON content type change to `application/json;charset=utf-8`.
|
||||||
|
([#263](https://github.com/haskell-servant/servant/issues/263))
|
||||||
|
Related browser bugs:
|
||||||
|
[Chromium](https://bugs.chromium.org/p/chromium/issues/detail?id=438464) and
|
||||||
|
[Firefox](https://bugzilla.mozilla.org/show_bug.cgi?id=918742)
|
||||||
|
|
||||||
0.9.1
|
0.9.1
|
||||||
------
|
------
|
||||||
|
|
||||||
|
|
|
@ -130,7 +130,9 @@ class Accept ctype where
|
||||||
|
|
||||||
-- | @application/json@
|
-- | @application/json@
|
||||||
instance Accept JSON where
|
instance Accept JSON where
|
||||||
contentType _ = "application" M.// "json"
|
contentTypes _ =
|
||||||
|
"application" M.// "json" M./: ("charset", "utf-8") NE.:|
|
||||||
|
[ "application" M.// "json" ]
|
||||||
|
|
||||||
-- | @application/x-www-form-urlencoded@
|
-- | @application/x-www-form-urlencoded@
|
||||||
instance Accept FormUrlEncoded where
|
instance Accept FormUrlEncoded where
|
||||||
|
|
|
@ -115,21 +115,21 @@ spec = describe "Servant.API.ContentTypes" $ do
|
||||||
|
|
||||||
it "returns the Content-Type as the first element of the tuple" $ do
|
it "returns the Content-Type as the first element of the tuple" $ do
|
||||||
handleAcceptH (Proxy :: Proxy '[JSON]) "*/*" (3 :: Int)
|
handleAcceptH (Proxy :: Proxy '[JSON]) "*/*" (3 :: Int)
|
||||||
`shouldSatisfy` ((== "application/json") . fst . fromJust)
|
`shouldSatisfy` ((== "application/json;charset=utf-8") . fst . fromJust)
|
||||||
handleAcceptH (Proxy :: Proxy '[PlainText, JSON]) "application/json" (3 :: Int)
|
handleAcceptH (Proxy :: Proxy '[PlainText, JSON]) "application/json" (3 :: Int)
|
||||||
`shouldSatisfy` ((== "application/json") . fst . fromJust)
|
`shouldSatisfy` ((== "application/json;charset=utf-8") . fst . fromJust)
|
||||||
handleAcceptH (Proxy :: Proxy '[PlainText, JSON, OctetStream])
|
handleAcceptH (Proxy :: Proxy '[PlainText, JSON, OctetStream])
|
||||||
"application/octet-stream" ("content" :: ByteString)
|
"application/octet-stream" ("content" :: ByteString)
|
||||||
`shouldSatisfy` ((== "application/octet-stream") . fst . fromJust)
|
`shouldSatisfy` ((== "application/octet-stream") . fst . fromJust)
|
||||||
|
|
||||||
it "returns the appropriately serialized representation" $ do
|
it "returns the appropriately serialized representation" $ do
|
||||||
property $ \x -> handleAcceptH (Proxy :: Proxy '[JSON]) "*/*" (x :: SomeData)
|
property $ \x -> handleAcceptH (Proxy :: Proxy '[JSON]) "*/*" (x :: SomeData)
|
||||||
== Just ("application/json", encode x)
|
== Just ("application/json;charset=utf-8", encode x)
|
||||||
|
|
||||||
it "respects the Accept spec ordering" $ do
|
it "respects the Accept spec ordering" $ do
|
||||||
let highest a b c = maximumBy (compare `on` snd)
|
let highest a b c = maximumBy (compare `on` snd)
|
||||||
[ ("application/octet-stream", a)
|
[ ("application/octet-stream", a)
|
||||||
, ("application/json", b)
|
, ("application/json;charset=utf-8", b)
|
||||||
, ("text/plain;charset=utf-8", c)
|
, ("text/plain;charset=utf-8", c)
|
||||||
]
|
]
|
||||||
let acceptH a b c = addToAccept (Proxy :: Proxy OctetStream) a $
|
let acceptH a b c = addToAccept (Proxy :: Proxy OctetStream) a $
|
||||||
|
|
Loading…
Reference in a new issue