haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add error-reporting when trying to add file or post-param after binary content is set.

Browse Source
This commit is contained in:
Konstantine Rybnikov 2013-08-09 23:13:56 +03:00
parent 441842ae12
commit 59eb67e087
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yesod-test/Yesod/Test.hs
View File

@ -49,6 +49,7 @@ module Yesod.Test
, addPostParam , addPostParam
, addGetParam , addGetParam
, addFile , addFile
, setRequestBody
, RequestBuilder , RequestBuilder
, setUrl , setUrl
@ -375,7 +376,7 @@ printMatches query = do
addPostParam :: T.Text -> T.Text -> RequestBuilder site () addPostParam :: T.Text -> T.Text -> RequestBuilder site ()
addPostParam name value = addPostParam name value =
ST.modify $ \rbd -> rbd { rbdPostData = (addPostData (rbdPostData rbd)) } ST.modify $ \rbd -> rbd { rbdPostData = (addPostData (rbdPostData rbd)) }
where addPostData x@(BinaryPostData _) = x where addPostData (BinaryPostData _) = error "Trying to add post param to binary content."
addPostData (MultipleItemsPostData posts) = addPostData (MultipleItemsPostData posts) =
MultipleItemsPostData $ ReqKvPart name value : posts MultipleItemsPostData $ ReqKvPart name value : posts
@ -392,7 +393,7 @@ addFile :: T.Text -> FilePath -> T.Text -> RequestBuilder site ()
addFile name path mimetype = do addFile name path mimetype = do
contents <- liftIO $ BSL8.readFile path contents <- liftIO $ BSL8.readFile path
ST.modify $ \rbd -> rbd { rbdPostData = (addPostData (rbdPostData rbd) contents) } ST.modify $ \rbd -> rbd { rbdPostData = (addPostData (rbdPostData rbd) contents) }
where addPostData x@(BinaryPostData _) _ = x where addPostData (BinaryPostData _) _ = error "Trying to add file after setting binary content."
addPostData (MultipleItemsPostData posts) contents = addPostData (MultipleItemsPostData posts) contents =
MultipleItemsPostData $ ReqFilePart name path contents mimetype : posts MultipleItemsPostData $ ReqFilePart name path contents mimetype : posts
@ -576,7 +577,7 @@ request reqBuilder = do
SRequest simpleRequest' (simpleRequestBody' rbdPostData) SRequest simpleRequest' (simpleRequestBody' rbdPostData)
where simpleRequestBody' (MultipleItemsPostData x) = where simpleRequestBody' (MultipleItemsPostData x) =
BSL8.fromChunks [multiPartBody x] BSL8.fromChunks [multiPartBody x]
simpleRequestBody' (BinaryPostData _) = "" -- simpleRequestBody' (BinaryPostData _) = ""
simpleRequest' = mkRequest simpleRequest' = mkRequest
[ ("Cookie", cookieValue) [ ("Cookie", cookieValue)
, ("Content-Type", contentTypeValue)] , ("Content-Type", contentTypeValue)]