diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 622a47d8..211c114c 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -119,7 +119,7 @@ test-suite tests cpp-options: -DTEST build-depends: base - ,hspec >= 1.1 && < 1.2 + ,hspec >= 1.2 && < 1.3 ,wai-test ,wai ,yesod-core diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index 6af96206..25a3ac86 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -44,7 +44,7 @@ test-suite tests type: exitcode-stdio-1.0 cpp-options: -DTEST_EXPORT build-depends: base - , hspec >= 1.0 && < 1.2 + , hspec >= 1.2 && < 1.3 , HUnit -- copy from above , containers >= 0.2 diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs index e8715d10..e8f11282 100644 --- a/yesod-test/Yesod/Test.hs +++ b/yesod-test/Yesod/Test.hs @@ -1,5 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE PackageImports #-} +{-# LANGUAGE CPP #-} {-| Yesod.Test is a pragmatic framework for testing web applications built 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 -- 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 (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' -- and 'ConnectionPool'