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

hspec 1.2 (fixes warnings)

Browse Source
This commit is contained in:
Michael Snoyman 2012-07-06 15:03:25 +03:00
parent e45933ec24
commit ce6aabf82f
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yesod-core/yesod-core.cabal
View File

@ -119,7 +119,7 @@ test-suite tests
cpp-options: -DTEST cpp-options: -DTEST
build-depends: base build-depends: base
,hspec >= 1.1 && < 1.2 ,hspec >= 1.2 && < 1.3
,wai-test ,wai-test
,wai ,wai
,yesod-core ,yesod-core

2
yesod-static/yesod-static.cabal
View File

@ -44,7 +44,7 @@ test-suite tests
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
cpp-options: -DTEST_EXPORT cpp-options: -DTEST_EXPORT
build-depends: base build-depends: base
, hspec >= 1.0 && < 1.2 , hspec >= 1.2 && < 1.3
, HUnit , HUnit
-- copy from above -- copy from above
, containers >= 0.2 , containers >= 0.2

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

@ -1,5 +1,5 @@
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE PackageImports #-} {-# LANGUAGE CPP #-}
{-| {-|
Yesod.Test is a pragmatic framework for testing web applications built Yesod.Test is a pragmatic framework for testing web applications built
using wai and persistent. using wai and persistent.
@ -133,10 +133,15 @@ type CookieValue = H.Ascii
-- --
-- Look at the examples directory on this package to get an idea of the (small) amount of -- Look at the examples directory on this package to get an idea of the (small) amount of
-- boilerplate code you'll need to write before calling this. -- boilerplate code you'll need to write before calling this.
runTests :: Application -> ConnectionPool -> Specs -> IO a runTests :: Application -> ConnectionPool -> Specs -> IO ()
runTests app connection specsDef = do runTests app connection specsDef = do
(SpecsData _ _ specs) <- ST.execStateT specsDef (SpecsData app connection []) (SpecsData _ _ specs) <- ST.execStateT specsDef (SpecsData app connection [])
Runner.hspecX specs #if MIN_VERSION_hspec(1,2,0)
Runner.hspec
#else
Runner.hspecX
#endif
specs
-- | Start describing a Tests suite keeping cookies and a reference to the tested 'Application' -- | Start describing a Tests suite keeping cookies and a reference to the tested 'Application'
-- and 'ConnectionPool' -- and 'ConnectionPool'