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

fix yesod mega

Browse Source
This commit is contained in:
Greg Weber 2011-11-26 10:44:56 -06:00
parent 6816039b21
commit 236d55f00b
17 changed files with 85 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/en.msg Symbolic link
View File

@ -0,0 +1 @@
yesod-core/en.msg

5
test/main.hs Normal file
View File

@ -0,0 +1,5 @@
import Test.Hspec
import qualified YesodCoreTest
main :: IO ()
main = hspecX $ descriptions $ YesodCoreTest.specs

1
test/yesod-core Symbolic link
View File

@ -0,0 +1 @@
../yesod-core/test

4
yesod-core/test.hs Normal file
View File

@ -0,0 +1,4 @@
import Test.Hspec
import qualified YesodCoreTest
main = hspecX $ descriptions $ YesodCoreTest.specs

24
yesod-core/test/YesodCoreTest.hs Normal file
View File

@ -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
]

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

@ -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()

2
yesod-core/test/Test/ErrorHandling.hs → yesod-core/test/YesodCoreTest/ErrorHandling.hs
View File

@ -1,5 +1,5 @@
{-# LANGUAGE TypeFamilies, QuasiQuotes, TemplateHaskell, MultiParamTypeClasses, OverloadedStrings #-}
module Test.ErrorHandling
module YesodCoreTest.ErrorHandling
( errorHandlingTest
, Widget
) where

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

@ -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 ()

2
yesod-core/test/Test/InternalRequest.hs → yesod-core/test/YesodCoreTest/InternalRequest.hs
View File

@ -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)

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

@ -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 ()

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

@ -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 ()

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

@ -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 ()

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

@ -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 ()

22
yesod-core/test/main.hs
View File

@ -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
]

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

@ -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

40
yesod-mega.cabal
View File

@ -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

2
yesod/yesod.cabal
View File

@ -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