git.iko.soy/typeable/wai
on master help sign in
move wai-app-static test helpers into wai-test
commit11731bfee39cd4725479e455defe43ee7aaf5db3 authorGreg Weber <greg@gregweber.info> dateSun 5 Feb 2012, 09:30 (15 years ago) parente0938a6
3 files changed+10−20
compare with master
unifiedsplit
wai-app-static/test/WaiAppStaticTest.hs+1−20 wai-test/Network/Wai/Test.hs+8 wai-test/wai-test.cabal+1
wai-app-static/test/WaiAppStaticTest.hs+1−20
@@ -27,26 +27,7 @@ import Control.Monad.IO.Class (liftIO)
2727import Data.Monoid (mempty)
2828
2929defRequest :: Request
30−defRequest = Request {
31− rawQueryString = ""
32−, queryString = []
33−, requestMethod = "GET"
34−, rawPathInfo = ""
35−, pathInfo = []
36−, requestHeaders = []
37−, serverName = "wai-test"
38−, httpVersion = H.http11
39−, serverPort = 80
40−, isSecure = False
41−, remoteHost = Sock.SockAddrInet 1 2
42−, vault = mempty
43−, requestBody = error "requestBody"
44−}
45−
46−setRawPathInfo :: Request -> S8.ByteString -> Request
47−setRawPathInfo r rawPinfo =
48− let pInfo = T.split (== '/') $ TE.decodeUtf8 rawPinfo
49− in r { rawPathInfo = rawPinfo, pathInfo = pInfo }
30+defRequest = defaultRequest
5031
5132specs :: Specs
5233specs = do
wai-test/Network/Wai/Test.hs+8
@@ -9,6 +9,7 @@ module Network.Wai.Test
99 , SRequest (..)
1010 , SResponse (..)
1111 , defaultRequest
12+ , setRawPathInfo
1213 -- * Assertions
1314 , assertStatus
1415 , assertContentType
@@ -33,6 +34,8 @@ import qualified Data.ByteString.Lazy.Char8 as L8
3334import qualified Network.HTTP.Types as H
3435import Data.CaseInsensitive (CI)
3536import qualified Data.ByteString as S
37+import qualified Data.Text as T
38+import qualified Data.Text.Encoding as TE
3639import qualified Data.Conduit as C
3740import qualified Data.Conduit.List as CL
3841import Data.Monoid (mempty)
@@ -79,6 +82,11 @@ defaultRequest = Request
7982 , vault = mempty
8083 }
8184
85+setRawPathInfo :: Request -> S8.ByteString -> Request
86+setRawPathInfo r rawPinfo =
87+ let pInfo = T.split (== '/') $ TE.decodeUtf8 rawPinfo
88+ in r { rawPathInfo = rawPinfo, pathInfo = pInfo }
89+
8290srequest :: SRequest -> Session SResponse
8391srequest (SRequest req bod) = do
8492 app <- ask
wai-test/wai-test.cabal+1
@@ -16,6 +16,7 @@ library
1616 build-depends: base >= 4 && < 5
1717 , wai >= 1.1 && < 1.2
1818 , bytestring >= 0.9.1.4 && < 0.10
19+ , text >= 0.7 && < 0.12
1920 , blaze-builder >= 0.2.1.4 && < 0.4
2021 , transformers >= 0.2.2 && < 0.3
2122 , containers >= 0.2 && < 0.5