git.iko.soy/typeable/wai
on master help sign in
Merge pull request #106 from sol/master

Require hspec-1.3.* for tests suites

commit6d2bcab54d2a8995d5fbd7d4d195aaf938d4dd26 authorMichael Snoyman <michael@snoyman.com> dateSat 15 Sep 2012, 09:50 (14 years ago) parent82c4880e0804ad
14 files changed+37−23
compare with master
unifiedsplit
wai-app-static/.ghci+1 wai-app-static/test/WaiAppStaticTest.hs+7−9 wai-app-static/tests.hs+3−3 wai-app-static/wai-app-static.cabal+1−2 wai-extra/.ghci+1 wai-extra/test/WaiExtraTest.hs+1−2 wai-extra/wai-extra.cabal+1−1 warp/.ghci+1 warp/test/ConduitSpec.hs+4−1 warp/test/ReadIntSpec.hs+4−1 warp/test/RequestSpec.hs+4−1 warp/test/ResponseHeaderSpec.hs+4−1 warp/test/RunSpec.hs+4−1 warp/warp.cabal+1−1
wai-app-static/.ghcinew file+1
@@ -0,0 +1 @@
1+:set -itest
wai-app-static/test/WaiAppStaticTest.hs+7−9
@@ -1,11 +1,9 @@
11{-# LANGUAGE OverloadedStrings, NoMonomorphismRestriction #-}
2−module WaiAppStaticTest (specs) where
2+module WaiAppStaticTest (spec) where
33
44import Network.Wai.Application.Static
55
6−import Test.Hspec.Monadic
7−import Test.Hspec.HUnit ()
8−import Test.HUnit ((@?=))
6+import Test.Hspec
97import qualified Data.ByteString.Char8 as S8
108-- import qualified Data.ByteString.Lazy.Char8 as L8
119import System.PosixCompat.Files (getFileStatus, modificationTime)
@@ -23,8 +21,8 @@ import Network.Mime
2321defRequest :: Request
2422defRequest = defaultRequest
2523
26−specs :: Specs
27−specs = do
24+spec :: Spec
25+spec = do
2826 let webApp = flip runSession $ staticApp $ defaultWebAppSettings "test"
2927 let fileServerApp = flip runSession $ staticApp $ defaultFileServerSettings "test"
3028
@@ -34,11 +32,11 @@ specs = do
3432
3533 describe "mime types" $ do
3634 it "fileNameExtensions" $
37− fileNameExtensions "foo.tar.gz" @?= ["tar.gz", "gz"]
35+ fileNameExtensions "foo.tar.gz" `shouldBe` ["tar.gz", "gz"]
3836 it "handles multi-extensions" $
39− defaultMimeLookup "foo.tar.gz" @?= "application/x-tgz"
37+ defaultMimeLookup "foo.tar.gz" `shouldBe` "application/x-tgz"
4038 it "defaults correctly" $
41− defaultMimeLookup "foo.unknown" @?= "application/octet-stream"
39+ defaultMimeLookup "foo.unknown" `shouldBe` "application/octet-stream"
4240
4341 describe "webApp" $ do
4442 it "403 for unsafe paths" $ webApp $
wai-app-static/tests.hs+3−3
@@ -1,5 +1,5 @@
1−import WaiAppStaticTest (specs)
1+import WaiAppStaticTest (spec)
22import Test.Hspec.Monadic
33
4−main :: IO a
5−main = hspecX specs
4+main :: IO ()
5+main = hspec spec
wai-app-static/wai-app-static.cabal+1−2
@@ -65,8 +65,7 @@ test-suite runtests
6565 type: exitcode-stdio-1.0
6666
6767 build-depends: base >= 4 && < 5
68− , hspec >= 0.8
69− , HUnit
68+ , hspec == 1.3.*
7069 , unix-compat
7170 , time
7271 , old-locale
wai-extra/.ghcinew file+1
@@ -0,0 +1 @@
1+:set -itest -optP-include -optPdist/build/autogen/cabal_macros.h
wai-extra/test/WaiExtraTest.hs+1−2
@@ -1,8 +1,7 @@
11{-# LANGUAGE OverloadedStrings #-}
22module WaiExtraTest (specs) where
33
4−import Test.Hspec.Monadic
5−import Test.Hspec.HUnit ()
4+import Test.Hspec
65import Test.HUnit hiding (Test)
76
87import Network.Wai
wai-extra/wai-extra.cabal+1−1
@@ -67,7 +67,7 @@ test-suite tests
6767 build-depends: base >= 4 && < 5
6868 , wai-extra
6969 , wai-test >= 1.3
70− , hspec
70+ , hspec == 1.3.*
7171 , HUnit
7272
7373 , wai
warp/.ghcinew file+1
@@ -0,0 +1 @@
1+:set -itest -idist/build/autogen
warp/test/ConduitSpec.hs+4−1
@@ -1,5 +1,5 @@
11{-# LANGUAGE OverloadedStrings #-}
2−module ConduitSpec where
2+module ConduitSpec (main, spec) where
33
44import Network.Wai.Handler.Warp.Conduit
55import Data.Conduit
@@ -9,6 +9,9 @@ import qualified Data.IORef as I
99import qualified Data.ByteString as S
1010import Control.Monad.Trans.Class (lift)
1111
12+main :: IO ()
13+main = hspec spec
14+
1215spec :: Spec
1316spec = describe "conduit" $ do
1417 it "IsolatedBSSource" $ runResourceT $ do
warp/test/ReadIntSpec.hs+4−1
@@ -1,4 +1,4 @@
1−module ReadIntSpec where
1+module ReadIntSpec (main, spec) where
22
33import Data.ByteString (ByteString)
44import Test.Hspec
@@ -6,6 +6,9 @@ import Network.Wai.Handler.Warp.ReadInt
66import qualified Data.ByteString.Char8 as B
77import qualified Test.QuickCheck as QC
88
9+main :: IO ()
10+main = hspec spec
11+
912spec :: Spec
1013spec = describe "readInt64" $ do
1114 it "converts ByteString to Int" $ QC.property (prop_read_show_idempotent readInt64)
warp/test/RequestSpec.hs+4−1
@@ -1,6 +1,6 @@
11{-# LANGUAGE OverloadedStrings #-}
22
3−module RequestSpec where
3+module RequestSpec (main, spec) where
44
55import Data.Conduit
66import Data.Conduit.List
@@ -8,6 +8,9 @@ import Network.Wai.Handler.Warp.Request
88import Network.Wai.Handler.Warp.Types
99import Test.Hspec
1010
11+main :: IO ()
12+main = hspec spec
13+
1114spec :: Spec
1215spec = describe "takeHeaders" $ do
1316 it "takes until blank" $
warp/test/ResponseHeaderSpec.hs+4−1
@@ -1,12 +1,15 @@
11{-# LANGUAGE OverloadedStrings #-}
22
3−module ResponseHeaderSpec where
3+module ResponseHeaderSpec (main, spec) where
44
55import Data.ByteString
66import qualified Network.HTTP.Types as H
77import Network.Wai.Handler.Warp.ResponseHeader
88import Test.Hspec
99
10+main :: IO ()
11+main = hspec spec
12+
1013spec :: Spec
1114spec = describe "composeHeader" $ do
1215 it "composes a HTTP header" $
warp/test/RunSpec.hs+4−1
@@ -1,6 +1,6 @@
11{-# LANGUAGE OverloadedStrings #-}
22
3−module RunSpec where
3+module RunSpec (main, spec) where
44
55import Control.Concurrent (forkIO, killThread, threadDelay)
66import Control.Monad (forM_)
@@ -19,6 +19,9 @@ import System.IO (hFlush, hClose)
1919import System.IO.Unsafe (unsafePerformIO)
2020import Test.Hspec
2121
22+main :: IO ()
23+main = hspec spec
24+
2225type Counter = I.IORef (Either String Int)
2326type CounterApplication = Counter -> Application
2427
warp/warp.cabal+1−1
@@ -75,7 +75,7 @@ Test-Suite spec
7575 , network
7676 , HUnit
7777 , QuickCheck
78− , hspec
78+ , hspec == 1.3.*
7979
8080Source-Repository head
8181 Type: git