bump hspec dependency

2011-09-15 09:37:55 -07:00 · 2011-09-15 09:37:55 -07:00 · 4bcfe87582
commit 4bcfe87582
parent be372022ec
10 changed files with 11 additions and 10 deletions
--- 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
--- 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
    ]
--- 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|<a href=@{RootR}>|]

-linksTest :: IO [IO Spec]
+linksTest :: [Spec]
 linksTest = describe "Test.Links"
    [ it "linkToHome" case_linkToHome
    ]
--- 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 "<!DOCTYPE html>\n<html><head><title></title><link rel=\"stylesheet\" href=\"all.css\"><link rel=\"stylesheet\" media=\"screen\" href=\"screen.css\"></head><body></body></html>"

-mediaTest :: IO [IO Spec]
+mediaTest :: [Spec]
 mediaTest = describe "Test.Media"
    [ it "media" caseMedia
    , it "media link" caseMediaLink
--- 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
    ]
--- a/yesod-core/test/Test/Widget.hs
+++ b/yesod-core/test/Test/Widget.hs
@ -69,7 +69,7 @@ getWhamletR = defaultLayout [whamlet|
  where
    embed = [whamlet|<h4>Embed|]

-widgetTest :: IO [IO Spec]
+widgetTest :: [Spec]
 widgetTest = describe "Test.Widget"
    [ it "addJuliusBody" case_addJuliusBody
    , it "whamlet" case_whamlet
--- 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
--- 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
--- 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
--- 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