git.iko.soy/typeable/wai
on master help sign in
wai-extra: Consolidate test suite
dae03aaSimon Hengel
wai-extra/test/WaiExtraTest.hs → wai-extra/test/WaiExtraSpec.hsrenamed+3−3
compare with master
unifiedsplit
@@ -1,5 +1,5 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2−module WaiExtraTest (specs) where
2+module WaiExtraSpec where
3
3
4import Test.Hspec
4import Test.Hspec
5import Test.HUnit hiding (Test)
5import Test.HUnit hiding (Test)
@@ -38,8 +38,8 @@ import System.IO (withFile, IOMode (ReadMode))
38
38
39import qualified Data.IORef as I
39import qualified Data.IORef as I
40
40
41−specs :: Spec
41+spec :: Spec
42−specs = do
42+spec = do
43 describe "Network.Wai.UrlMap" $ do
43 describe "Network.Wai.UrlMap" $ do
44 mapM_ (uncurry it) casesUrlMap
44 mapM_ (uncurry it) casesUrlMap
45
45
wai-extra/tests.hsdeleted−5
@@ -1,5 +0,0 @@
1−import Test.Hspec
2−import qualified WaiExtraTest
3−
4−main :: IO ()
5−main = hspec WaiExtraTest.specs
wai-extra/wai-extra.cabal+9−24
@@ -73,39 +73,24 @@ Library
73 other-modules: Network.Wai.Middleware.RequestLogger.Internal
73 other-modules: Network.Wai.Middleware.RequestLogger.Internal
74 ghc-options: -Wall
74 ghc-options: -Wall
75
75
76−
77−test-suite tests
78− hs-source-dirs: test
79− main-is: ../tests.hs
80− type: exitcode-stdio-1.0
81−
82− build-depends: base >= 4 && < 5
83− , wai-extra
84− , hspec >= 1.3
85− , HUnit
86−
87− , wai
88− , http-types
89− , transformers
90− , zlib
91− , text
92− , bytestring
93− , directory
94− , blaze-builder >= 0.2.1.4 && < 0.4
95− , data-default
96− , fast-logger >= 2.1
97− , resourcet
98− ghc-options: -Wall
99−
100test-suite spec
76test-suite spec
101 type: exitcode-stdio-1.0
77 type: exitcode-stdio-1.0
102 hs-source-dirs: test
78 hs-source-dirs: test
103 main-is: Spec.hs
79 main-is: Spec.hs
104 other-modules: Network.Wai.TestSpec
80 other-modules: Network.Wai.TestSpec
81+ WaiExtraSpec
105 build-depends: base >= 4 && < 5
82 build-depends: base >= 4 && < 5
106 , wai-extra
83 , wai-extra
107 , wai
84 , wai
108 , hspec >= 1.3
85 , hspec >= 1.3
86+ , transformers
87+ , fast-logger
88+ , http-types
89+ , zlib
90+ , text
91+ , resourcet
92+ , bytestring
93+ , HUnit
109 ghc-options: -Wall -Werror
94 ghc-options: -Wall -Werror
110
95
111source-repository head
96source-repository head