From 4bcfe8758221316b9af8d88273a024171e989fe6 Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Thu, 15 Sep 2011 09:37:55 -0700 Subject: [PATCH] bump hspec dependency --- yesod-core/test/Test/CleanPath.hs | 2 +- yesod-core/test/Test/Exceptions.hs | 2 +- yesod-core/test/Test/Links.hs | 2 +- yesod-core/test/Test/Media.hs | 2 +- yesod-core/test/Test/NoOverloadedStrings.hs | 2 +- yesod-core/test/Test/Widget.hs | 2 +- yesod-core/yesod-core.cabal | 2 +- yesod-static/tests/runtests.hs | 3 ++- yesod-static/tests/unicode/wai-app-static.cabal | 2 +- yesod-static/yesod-static.cabal | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/yesod-core/test/Test/CleanPath.hs b/yesod-core/test/Test/CleanPath.hs index ce01a96d..656da813 100644 --- a/yesod-core/test/Test/CleanPath.hs +++ b/yesod-core/test/Test/CleanPath.hs @@ -62,7 +62,7 @@ getBarR, getPlainR :: Handler RepPlain getBarR = return $ RepPlain "bar" getPlainR = return $ RepPlain "plain" -cleanPathTest :: IO [IO Spec] +cleanPathTest :: [Spec] cleanPathTest = describe "Test.CleanPath" [ it "remove trailing slash" removeTrailingSlash diff --git a/yesod-core/test/Test/Exceptions.hs b/yesod-core/test/Test/Exceptions.hs index 639ccbd1..61bab779 100644 --- a/yesod-core/test/Test/Exceptions.hs +++ b/yesod-core/test/Test/Exceptions.hs @@ -22,7 +22,7 @@ instance Yesod Y where getRootR :: Handler () getRootR = error "FOOBAR" >> return () -exceptionsTest :: IO [IO Spec] +exceptionsTest :: [Spec] exceptionsTest = describe "Test.Exceptions" [ it "500" case500 ] diff --git a/yesod-core/test/Test/Links.hs b/yesod-core/test/Test/Links.hs index ac237f44..69679625 100644 --- a/yesod-core/test/Test/Links.hs +++ b/yesod-core/test/Test/Links.hs @@ -21,7 +21,7 @@ instance Yesod Y where getRootR :: Handler RepHtml getRootR = defaultLayout $ addHamlet [hamlet||] -linksTest :: IO [IO Spec] +linksTest :: [Spec] linksTest = describe "Test.Links" [ it "linkToHome" case_linkToHome ] diff --git a/yesod-core/test/Test/Media.hs b/yesod-core/test/Test/Media.hs index 1f86ecdb..4e863db9 100644 --- a/yesod-core/test/Test/Media.hs +++ b/yesod-core/test/Test/Media.hs @@ -52,7 +52,7 @@ caseMediaLink = runner $ do assertStatus 200 res flip assertBody res "\n" -mediaTest :: IO [IO Spec] +mediaTest :: [Spec] mediaTest = describe "Test.Media" [ it "media" caseMedia , it "media link" caseMediaLink diff --git a/yesod-core/test/Test/NoOverloadedStrings.hs b/yesod-core/test/Test/NoOverloadedStrings.hs index d0a2d6ce..f162d7f2 100644 --- a/yesod-core/test/Test/NoOverloadedStrings.hs +++ b/yesod-core/test/Test/NoOverloadedStrings.hs @@ -46,7 +46,7 @@ case_sanity = runner $ do res <- request defaultRequest assertBody mempty res -noOverloadedTest :: IO [IO Spec] +noOverloadedTest :: [Spec] noOverloadedTest = describe "Test.NoOverloadedStrings" [ it "sanity" case_sanity ] diff --git a/yesod-core/test/Test/Widget.hs b/yesod-core/test/Test/Widget.hs index 6052c51f..8de0b268 100644 --- a/yesod-core/test/Test/Widget.hs +++ b/yesod-core/test/Test/Widget.hs @@ -69,7 +69,7 @@ getWhamletR = defaultLayout [whamlet| where embed = [whamlet|

Embed|] -widgetTest :: IO [IO Spec] +widgetTest :: [Spec] widgetTest = describe "Test.Widget" [ it "addJuliusBody" case_addJuliusBody , it "whamlet" case_whamlet diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 1b520dc4..233b95c6 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -91,7 +91,7 @@ test-suite runtests build-depends: base >= 4 && < 4.3 main-is: main.hs cpp-options: -DTEST - build-depends: hspec >= 0.6.1 && < 0.7 + build-depends: hspec >= 0.8 && < 0.9 ,wai-test ,wai ,yesod-core diff --git a/yesod-static/tests/runtests.hs b/yesod-static/tests/runtests.hs index a1dcb983..20ce829a 100644 --- a/yesod-static/tests/runtests.hs +++ b/yesod-static/tests/runtests.hs @@ -6,7 +6,8 @@ import Test.Hspec.HUnit () -- import Test.Hspec.QuickCheck (prop) main :: IO () -main = hspecX $ return [] {- FIXME specs +main = return () -- hspecX $ return [] +{- FIXME specs specs :: IO [Spec] specs = runSpecM $ do diff --git a/yesod-static/tests/unicode/wai-app-static.cabal b/yesod-static/tests/unicode/wai-app-static.cabal index 6c89fb4e..066d54e3 100644 --- a/yesod-static/tests/unicode/wai-app-static.cabal +++ b/yesod-static/tests/unicode/wai-app-static.cabal @@ -48,7 +48,7 @@ test-suite runtests type: exitcode-stdio-1.0 build-depends: base >= 4 && < 5 - , hspec >= 0.6.1 && < 0.7 + , hspec >= 0.8 && < 0.9 , HUnit , unix-compat >= 0.2 && < 0.3 , time >= 1.1.4 && < 1.3 diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index 5c11f79c..e503db0c 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -44,7 +44,7 @@ test-suite runtests cpp-options: -DTEST build-depends: yesod-static , base >= 4 && < 5 - , hspec >= 0.6.1 && < 0.7 + , hspec >= 0.8 && < 0.9 , HUnit ghc-options: -Wall main-is: runtests.hs