From 014732dac87a7e7192ca3264ad01de839b9bbdbc Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 26 Jun 2012 10:56:50 +0300 Subject: [PATCH] hspec 1.2 --- yesod-core/yesod-core.cabal | 2 +- yesod-form/yesod-form.cabal | 2 +- yesod-routes/yesod-routes.cabal | 2 +- yesod-static/yesod-static.cabal | 2 +- yesod-test/Yesod/Test.hs | 4 ++-- yesod-test/yesod-test.cabal | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index a79d9079..1e83e064 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -109,7 +109,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-form/yesod-form.cabal b/yesod-form/yesod-form.cabal index d6c5129e..549ab02a 100644 --- a/yesod-form/yesod-form.cabal +++ b/yesod-form/yesod-form.cabal @@ -23,7 +23,7 @@ library , persistent >= 1.0 && < 1.1 , template-haskell , transformers >= 0.2.2 && < 0.4 - , data-default >= 0.3 && < 0.5 + , data-default , xss-sanitize >= 0.3.0.1 && < 0.4 , blaze-builder >= 0.2.1.4 && < 0.4 , network >= 2.2 && < 2.4 diff --git a/yesod-routes/yesod-routes.cabal b/yesod-routes/yesod-routes.cabal index ddb039b2..3fe03050 100644 --- a/yesod-routes/yesod-routes.cabal +++ b/yesod-routes/yesod-routes.cabal @@ -42,7 +42,7 @@ test-suite runtests , yesod-routes , text >= 0.5 && < 0.12 , HUnit >= 1.2 && < 1.3 - , hspec >= 0.6 && < 1.2 + , hspec >= 1.2 && < 1.3 , containers , template-haskell , path-pieces diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index 636404fa..cf39f1c8 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -45,7 +45,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..312eb889 100644 --- a/yesod-test/Yesod/Test.hs +++ b/yesod-test/Yesod/Test.hs @@ -133,10 +133,10 @@ 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 + Runner.hspec specs -- | Start describing a Tests suite keeping cookies and a reference to the tested 'Application' -- and 'ConnectionPool' diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal index 3efa96c7..550cecb8 100644 --- a/yesod-test/yesod-test.cabal +++ b/yesod-test/yesod-test.cabal @@ -24,7 +24,7 @@ library , network >= 2.2 && < 2.4 , http-types >= 0.6 && < 0.7 , HUnit >= 1.2 && < 1.3 - , hspec >= 1.1 && < 1.2 + , hspec >= 1.2 && < 1.3 , bytestring >= 0.9 , case-insensitive >= 0.2 , text