@@ -1,5 +1,7 @@
11{-# LANGUAGE OverloadedStrings #-}
2−import Test.Hspec
2+module WaiExtraTest (specs) where
3+
4+import Test.Hspec.Monadic
35import Test.Hspec.HUnit ()
46import Test.HUnit hiding (Test)
57
@@ -28,13 +30,13 @@ import Control.Monad.IO.Class (liftIO)
2830import Data.Maybe (fromMaybe)
2931import Network.HTTP.Types (parseSimpleQuery, status200)
3032
31−main :: IO ()
32−main = hspecX $ do
33− describe "Network.Wai.Parse"
34− [ it "parseQueryString" caseParseQueryString
35− , it "parseQueryString with question mark" caseParseQueryStringQM
36− , it "parseHttpAccept" caseParseHttpAccept
37− , it "parseRequestBody" caseParseRequestBody
33+specs :: Specs
34+specs = do
35+ describe "Network.Wai.Parse" $ do
36+ it "parseQueryString" caseParseQueryString
37+ it "parseQueryString with question mark" caseParseQueryStringQM
38+ it "parseHttpAccept" caseParseHttpAccept
39+ it "parseRequestBody" caseParseRequestBody
3840 {-
3941 , it "findBound" caseFindBound
4042 , it "sinkTillBound" caseSinkTillBound
@@ -42,16 +44,15 @@ main = hspecX $ do
4244 , it "killCRLF" caseKillCRLF
4345 , it "takeLine" caseTakeLine
4446 -}
45− , it "jsonp" caseJsonp
46− , it "gzip" caseGzip
47− , it "gzip not for MSIE" caseGzipMSIE
48− , it "vhost" caseVhost
49− , it "autohead" caseAutohead
50− , it "method override" caseMethodOverride
51− , it "accept override" caseAcceptOverride
52− , it "dalvik multipart" caseDalvikMultipart
53− , it "debug request body" caseDebugRequestBody
54− ]
47+ it "jsonp" caseJsonp
48+ it "gzip" caseGzip
49+ it "gzip not for MSIE" caseGzipMSIE
50+ it "vhost" caseVhost
51+ it "autohead" caseAutohead
52+ it "method override" caseMethodOverride
53+ it "accept override" caseAcceptOverride
54+ it "dalvik multipart" caseDalvikMultipart
55+ it "debug request body" caseDebugRequestBody
5556
5657caseParseQueryString :: Assertion
5758caseParseQueryString = do
@@ -393,7 +394,7 @@ caseDalvikMultipart = do
393394 let request' = defaultRequest
394395 { requestHeaders = headers
395396 }
396− (params, files) <- run_ $ enumFile "test/dalvik-request" $$ parseRequestBody lbsSink request'
397+ (params, files) <- run_ $ enumFile "test/requests/dalvik-request" $$ parseRequestBody lbsSink request'
397398 lookup "scannedTime" params @?= Just "1.298590056748E9"
398399 lookup "geoLong" params @?= Just "0"
399400 lookup "geoLat" params @?= Just "0"