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

Merge branch 'master' of https://github.com/yesodweb/yesod

Browse Source
This commit is contained in:
Björn Buckwalter 2011-09-16 08:16:58 +08:00
commit da11ddc1c1
11 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts

@ -1 +1 @@
Subproject commit fc9feeee6d330d4df7d4aab7c015387da93f0192 Subproject commit f56426fada59012329f23c928a2d7f9c3a515d75

2
yesod-core/test/Test/CleanPath.hs
View File

@ -62,7 +62,7 @@ getBarR, getPlainR :: Handler RepPlain
getBarR = return $ RepPlain "bar" getBarR = return $ RepPlain "bar"
getPlainR = return $ RepPlain "plain" getPlainR = return $ RepPlain "plain"
cleanPathTest :: IO [IO Spec] cleanPathTest :: [Spec]
cleanPathTest = cleanPathTest =
describe "Test.CleanPath" describe "Test.CleanPath"
[ it "remove trailing slash" removeTrailingSlash [ it "remove trailing slash" removeTrailingSlash

2
yesod-core/test/Test/Exceptions.hs
View File

@ -22,7 +22,7 @@ instance Yesod Y where
getRootR :: Handler () getRootR :: Handler ()
getRootR = error "FOOBAR" >> return () getRootR = error "FOOBAR" >> return ()
exceptionsTest :: IO [IO Spec] exceptionsTest :: [Spec]
exceptionsTest = describe "Test.Exceptions" exceptionsTest = describe "Test.Exceptions"
[ it "500" case500 [ it "500" case500
] ]

2
yesod-core/test/Test/Links.hs
View File

@ -21,7 +21,7 @@ instance Yesod Y where
getRootR :: Handler RepHtml getRootR :: Handler RepHtml
getRootR = defaultLayout $ addHamlet [hamlet|<a href=@{RootR}>|] getRootR = defaultLayout $ addHamlet [hamlet|<a href=@{RootR}>|]
linksTest :: IO [IO Spec] linksTest :: [Spec]
linksTest = describe "Test.Links" linksTest = describe "Test.Links"
[ it "linkToHome" case_linkToHome [ it "linkToHome" case_linkToHome
] ]

2
yesod-core/test/Test/Media.hs
View File

@ -52,7 +52,7 @@ caseMediaLink = runner $ do
assertStatus 200 res 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>" 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" mediaTest = describe "Test.Media"
[ it "media" caseMedia [ it "media" caseMedia
, it "media link" caseMediaLink , it "media link" caseMediaLink

2
yesod-core/test/Test/NoOverloadedStrings.hs
View File

@ -46,7 +46,7 @@ case_sanity = runner $ do
res <- request defaultRequest res <- request defaultRequest
assertBody mempty res assertBody mempty res
noOverloadedTest :: IO [IO Spec] noOverloadedTest :: [Spec]
noOverloadedTest = describe "Test.NoOverloadedStrings" noOverloadedTest = describe "Test.NoOverloadedStrings"
[ it "sanity" case_sanity [ it "sanity" case_sanity
] ]

2
yesod-core/test/Test/Widget.hs
View File

@ -69,7 +69,7 @@ getWhamletR = defaultLayout [whamlet|
where where
embed = [whamlet|<h4>Embed|] embed = [whamlet|<h4>Embed|]
widgetTest :: IO [IO Spec] widgetTest :: [Spec]
widgetTest = describe "Test.Widget" widgetTest = describe "Test.Widget"
[ it "addJuliusBody" case_addJuliusBody [ it "addJuliusBody" case_addJuliusBody
, it "whamlet" case_whamlet , it "whamlet" case_whamlet

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

@ -91,7 +91,7 @@ test-suite runtests
build-depends: base >= 4 && < 4.3 build-depends: base >= 4 && < 4.3
main-is: main.hs main-is: main.hs
cpp-options: -DTEST cpp-options: -DTEST
build-depends: hspec >= 0.6.1 && < 0.7 build-depends: hspec >= 0.8 && < 0.9
,wai-test ,wai-test
,wai ,wai
,yesod-core ,yesod-core

3
yesod-static/tests/runtests.hs
View File

@ -6,7 +6,8 @@ import Test.Hspec.HUnit ()
-- import Test.Hspec.QuickCheck (prop) -- import Test.Hspec.QuickCheck (prop)
main :: IO () main :: IO ()
main = hspecX $ return [] {- FIXME specs main = return () -- hspecX $ return []
{- FIXME specs
specs :: IO [Spec] specs :: IO [Spec]
specs = runSpecM $ do specs = runSpecM $ do

2
yesod-static/tests/unicode/wai-app-static.cabal
View File

@ -48,7 +48,7 @@ test-suite runtests
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, hspec >= 0.6.1 && < 0.7 , hspec >= 0.8 && < 0.9
, HUnit , HUnit
, unix-compat >= 0.2 && < 0.3 , unix-compat >= 0.2 && < 0.3
, time >= 1.1.4 && < 1.3 , time >= 1.1.4 && < 1.3

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

@ -44,7 +44,7 @@ test-suite runtests
cpp-options: -DTEST cpp-options: -DTEST
build-depends: yesod-static build-depends: yesod-static
, base >= 4 && < 5 , base >= 4 && < 5
, hspec >= 0.6.1 && < 0.7 , hspec >= 0.8 && < 0.9
, HUnit , HUnit
ghc-options: -Wall ghc-options: -Wall
main-is: runtests.hs main-is: runtests.hs