From 236d55f00b9a3e6481fc17df59e01ab50db0446e Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Sat, 26 Nov 2011 10:44:56 -0600 Subject: [PATCH] fix yesod mega --- test/en.msg | 1 + test/main.hs | 5 +++ test/yesod-core | 1 + yesod-core/test.hs | 4 ++ yesod-core/test/YesodCoreTest.hs | 24 +++++++++++ .../test/{Test => YesodCoreTest}/CleanPath.hs | 2 +- .../{Test => YesodCoreTest}/ErrorHandling.hs | 2 +- .../{Test => YesodCoreTest}/Exceptions.hs | 2 +- .../InternalRequest.hs | 2 +- .../test/{Test => YesodCoreTest}/Links.hs | 2 +- .../test/{Test => YesodCoreTest}/Media.hs | 2 +- .../NoOverloadedStrings.hs | 2 +- .../test/{Test => YesodCoreTest}/Widget.hs | 2 +- yesod-core/test/main.hs | 22 ---------- yesod-core/yesod-core.cabal | 8 ++-- yesod-mega.cabal | 40 +++++++++++++++++-- yesod/yesod.cabal | 2 +- 17 files changed, 85 insertions(+), 38 deletions(-) create mode 120000 test/en.msg create mode 100644 test/main.hs create mode 120000 test/yesod-core create mode 100644 yesod-core/test.hs create mode 100644 yesod-core/test/YesodCoreTest.hs rename yesod-core/test/{Test => YesodCoreTest}/CleanPath.hs (98%) rename yesod-core/test/{Test => YesodCoreTest}/ErrorHandling.hs (98%) rename yesod-core/test/{Test => YesodCoreTest}/Exceptions.hs (93%) rename yesod-core/test/{Test => YesodCoreTest}/InternalRequest.hs (98%) rename yesod-core/test/{Test => YesodCoreTest}/Links.hs (94%) rename yesod-core/test/{Test => YesodCoreTest}/Media.hs (97%) rename yesod-core/test/{Test => YesodCoreTest}/NoOverloadedStrings.hs (93%) rename yesod-core/test/{Test => YesodCoreTest}/Widget.hs (98%) delete mode 100644 yesod-core/test/main.hs diff --git a/test/en.msg b/test/en.msg new file mode 120000 index 00000000..f6159dee --- /dev/null +++ b/test/en.msg @@ -0,0 +1 @@ +yesod-core/en.msg \ No newline at end of file diff --git a/test/main.hs b/test/main.hs new file mode 100644 index 00000000..b04ec7db --- /dev/null +++ b/test/main.hs @@ -0,0 +1,5 @@ +import Test.Hspec +import qualified YesodCoreTest + +main :: IO () +main = hspecX $ descriptions $ YesodCoreTest.specs diff --git a/test/yesod-core b/test/yesod-core new file mode 120000 index 00000000..aaa0236b --- /dev/null +++ b/test/yesod-core @@ -0,0 +1 @@ +../yesod-core/test \ No newline at end of file diff --git a/yesod-core/test.hs b/yesod-core/test.hs new file mode 100644 index 00000000..7a8397c2 --- /dev/null +++ b/yesod-core/test.hs @@ -0,0 +1,4 @@ +import Test.Hspec +import qualified YesodCoreTest + +main = hspecX $ descriptions $ YesodCoreTest.specs diff --git a/yesod-core/test/YesodCoreTest.hs b/yesod-core/test/YesodCoreTest.hs new file mode 100644 index 00000000..5f70039f --- /dev/null +++ b/yesod-core/test/YesodCoreTest.hs @@ -0,0 +1,24 @@ +module YesodCoreTest (specs) where + +import YesodCoreTest.CleanPath +import YesodCoreTest.Exceptions +import YesodCoreTest.Widget +import YesodCoreTest.Media +import YesodCoreTest.Links +import YesodCoreTest.NoOverloadedStrings +import YesodCoreTest.InternalRequest +import YesodCoreTest.ErrorHandling + +import Test.Hspec + +specs :: [Specs] +specs = -- concat + [ cleanPathTest + , exceptionsTest + , widgetTest + , mediaTest + , linksTest + , noOverloadedTest + , internalRequestTest + , errorHandlingTest + ] diff --git a/yesod-core/test/Test/CleanPath.hs b/yesod-core/test/YesodCoreTest/CleanPath.hs similarity index 98% rename from yesod-core/test/Test/CleanPath.hs rename to yesod-core/test/YesodCoreTest/CleanPath.hs index 656da813..b07464ea 100644 --- a/yesod-core/test/Test/CleanPath.hs +++ b/yesod-core/test/YesodCoreTest/CleanPath.hs @@ -1,7 +1,7 @@ {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE FlexibleInstances #-} -module Test.CleanPath (cleanPathTest, Widget) where +module YesodCoreTest.CleanPath (cleanPathTest, Widget) where import Test.Hspec import Test.Hspec.HUnit() diff --git a/yesod-core/test/Test/ErrorHandling.hs b/yesod-core/test/YesodCoreTest/ErrorHandling.hs similarity index 98% rename from yesod-core/test/Test/ErrorHandling.hs rename to yesod-core/test/YesodCoreTest/ErrorHandling.hs index 51dd8c67..271469d7 100644 --- a/yesod-core/test/Test/ErrorHandling.hs +++ b/yesod-core/test/YesodCoreTest/ErrorHandling.hs @@ -1,5 +1,5 @@ {-# LANGUAGE TypeFamilies, QuasiQuotes, TemplateHaskell, MultiParamTypeClasses, OverloadedStrings #-} -module Test.ErrorHandling +module YesodCoreTest.ErrorHandling ( errorHandlingTest , Widget ) where diff --git a/yesod-core/test/Test/Exceptions.hs b/yesod-core/test/YesodCoreTest/Exceptions.hs similarity index 93% rename from yesod-core/test/Test/Exceptions.hs rename to yesod-core/test/YesodCoreTest/Exceptions.hs index 61bab779..a65a6c28 100644 --- a/yesod-core/test/Test/Exceptions.hs +++ b/yesod-core/test/YesodCoreTest/Exceptions.hs @@ -1,7 +1,7 @@ {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE FlexibleInstances #-} -module Test.Exceptions (exceptionsTest, Widget) where +module YesodCoreTest.Exceptions (exceptionsTest, Widget) where import Test.Hspec import Test.Hspec.HUnit () diff --git a/yesod-core/test/Test/InternalRequest.hs b/yesod-core/test/YesodCoreTest/InternalRequest.hs similarity index 98% rename from yesod-core/test/Test/InternalRequest.hs rename to yesod-core/test/YesodCoreTest/InternalRequest.hs index 97e90b98..6615ddd1 100644 --- a/yesod-core/test/Test/InternalRequest.hs +++ b/yesod-core/test/YesodCoreTest/InternalRequest.hs @@ -1,5 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} -module Test.InternalRequest (internalRequestTest) where +module YesodCoreTest.InternalRequest (internalRequestTest) where import Data.List (nub) import System.Random (StdGen, mkStdGen) diff --git a/yesod-core/test/Test/Links.hs b/yesod-core/test/YesodCoreTest/Links.hs similarity index 94% rename from yesod-core/test/Test/Links.hs rename to yesod-core/test/YesodCoreTest/Links.hs index 69679625..6df9ab62 100644 --- a/yesod-core/test/Test/Links.hs +++ b/yesod-core/test/YesodCoreTest/Links.hs @@ -1,7 +1,7 @@ {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE FlexibleInstances #-} -module Test.Links (linksTest, Widget) where +module YesodCoreTest.Links (linksTest, Widget) where import Test.Hspec import Test.Hspec.HUnit () diff --git a/yesod-core/test/Test/Media.hs b/yesod-core/test/YesodCoreTest/Media.hs similarity index 97% rename from yesod-core/test/Test/Media.hs rename to yesod-core/test/YesodCoreTest/Media.hs index 4e863db9..43033785 100644 --- a/yesod-core/test/Test/Media.hs +++ b/yesod-core/test/YesodCoreTest/Media.hs @@ -1,7 +1,7 @@ {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE FlexibleInstances #-} -module Test.Media (mediaTest, Widget) where +module YesodCoreTest.Media (mediaTest, Widget) where import Test.Hspec import Test.Hspec.HUnit () diff --git a/yesod-core/test/Test/NoOverloadedStrings.hs b/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs similarity index 93% rename from yesod-core/test/Test/NoOverloadedStrings.hs rename to yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs index f162d7f2..24f9d75f 100644 --- a/yesod-core/test/Test/NoOverloadedStrings.hs +++ b/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs @@ -1,6 +1,6 @@ {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-} {-# LANGUAGE FlexibleInstances #-} -module Test.NoOverloadedStrings (noOverloadedTest, Widget) where +module YesodCoreTest.NoOverloadedStrings (noOverloadedTest, Widget) where import Test.Hspec import Test.Hspec.HUnit () diff --git a/yesod-core/test/Test/Widget.hs b/yesod-core/test/YesodCoreTest/Widget.hs similarity index 98% rename from yesod-core/test/Test/Widget.hs rename to yesod-core/test/YesodCoreTest/Widget.hs index 8de0b268..acd86a1b 100644 --- a/yesod-core/test/Test/Widget.hs +++ b/yesod-core/test/YesodCoreTest/Widget.hs @@ -1,7 +1,7 @@ {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE FlexibleInstances #-} -module Test.Widget (widgetTest) where +module YesodCoreTest.Widget (widgetTest) where import Test.Hspec import Test.Hspec.HUnit () diff --git a/yesod-core/test/main.hs b/yesod-core/test/main.hs deleted file mode 100644 index 2afdda64..00000000 --- a/yesod-core/test/main.hs +++ /dev/null @@ -1,22 +0,0 @@ -import Test.Hspec - -import Test.CleanPath -import Test.Exceptions -import Test.Widget -import Test.Media -import Test.Links -import Test.NoOverloadedStrings -import Test.InternalRequest -import Test.ErrorHandling - -main :: IO () -main = hspecX $ descriptions $ - [ cleanPathTest - , exceptionsTest - , widgetTest - , mediaTest - , linksTest - , noOverloadedTest - , internalRequestTest - , errorHandlingTest - ] diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index d28212ab..ed378df9 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -93,20 +93,20 @@ library if flag(test) Buildable: False -test-suite runtests +test-suite tests type: exitcode-stdio-1.0 - main-is: main.hs + main-is: ../test.hs hs-source-dirs: test if flag(ghc7) type: exitcode-stdio-1.0 build-depends: base >= 4.3 && < 5 cpp-options: -DGHC7 - main-is: main.hs + main-is: test.hs else type: exitcode-stdio-1.0 build-depends: base >= 4 && < 4.3 - main-is: main.hs + main-is: test.hs cpp-options: -DTEST build-depends: hspec >= 0.8 && < 0.10 ,wai-test >= 0.1.2 && < 0.2 diff --git a/yesod-mega.cabal b/yesod-mega.cabal index 11714eef..175c643e 100644 --- a/yesod-mega.cabal +++ b/yesod-mega.cabal @@ -10,7 +10,7 @@ description: category: Web, Yesod stability: Stable -cabal-version: >= 1.6 +cabal-version: >= 1.8 build-type: Simple homepage: http://www.yesodweb.com/ @@ -84,7 +84,9 @@ library Yesod.RssFeed Yesod.Feed - other-modules: + other-modules: + -- yesod-newsfeed + Yesod.FeedTypes -- yesod-core Yesod.Internal Yesod.Internal.Core @@ -117,9 +119,9 @@ library -- yesod Cabal >= 1.8 && < 1.13 , shakespeare-text >= 0.10 && < 0.11 - , attoparsec-text >= 0.8.5 && < 0.9 , filepath >= 1.1 && < 1.3 , process + , attoparsec-text >= 0.8.5 && < 0.8.5.2 -- yesod-sitemap -- empty @@ -185,6 +187,38 @@ library , aeson-native >= 0.3.3.1 && < 0.4 ghc-options: -Wall +test-suite tests + type: exitcode-stdio-1.0 + main-is: main.hs + hs-source-dirs: + test + yesod-core/test + + if flag(ghc7) + type: exitcode-stdio-1.0 + build-depends: base >= 4.3 && < 5 + cpp-options: -DGHC7 + main-is: test.hs + else + type: exitcode-stdio-1.0 + build-depends: base >= 4 && < 4.3 + main-is: test.hs + cpp-options: -DTEST + build-depends: yesod-mega + ,hspec >= 0.8 && < 0.10 + ,wai-test >= 0.1.2 && < 0.2 + ,wai + ,bytestring + ,hamlet + ,shakespeare-css + ,shakespeare-js + ,text + ,http-types + , random + ,HUnit + ,QuickCheck >= 2 && < 3 + , enumerator + ghc-options: -Wall source-repository head type: git diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index 349e038a..c5fd7c71 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -104,7 +104,7 @@ executable yesod , Cabal >= 1.8 && < 1.13 , unix-compat >= 0.2 && < 0.4 , containers >= 0.2 && < 0.5 - , attoparsec-text >= 0.8.5 && < 0.9 + , attoparsec-text >= 0.8.5 && < 0.8.5.2 , http-types >= 0.6.1 && < 0.7 , blaze-builder >= 0.2.1.4 && < 0.4 , filepath >= 1.1 && < 1.3