From 4a6bdc0db749e09cacd18653fb58fb889268ec6d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 15 Oct 2012 08:58:01 +0200 Subject: [PATCH 01/14] Version bumps --- yesod-core/yesod-core.cabal | 2 +- yesod/yesod.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 4c9ae06e..1b67f47a 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.1.3 +version: 1.1.3.1 license: MIT license-file: LICENSE author: Michael Snoyman diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index d8689e69..45f99d96 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -1,5 +1,5 @@ name: yesod -version: 1.1.1.2 +version: 1.1.2 license: MIT license-file: LICENSE author: Michael Snoyman From 23da1c9cb2554440a650d32ef5c9966c6b53f6d8 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 15 Oct 2012 09:54:42 +0200 Subject: [PATCH 02/14] New yesod-platform --- yesod-platform/yesod-platform.cabal | 52 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/yesod-platform/yesod-platform.cabal b/yesod-platform/yesod-platform.cabal index cbfdc832..e706d3f1 100644 --- a/yesod-platform/yesod-platform.cabal +++ b/yesod-platform/yesod-platform.cabal @@ -1,5 +1,5 @@ name: yesod-platform -version: 1.1.3 +version: 1.1.4 license: MIT license-file: LICENSE author: Michael Snoyman @@ -32,7 +32,7 @@ library , cereal == 0.3.5.2 , certificate == 1.2.8 , clientsession == 0.8.0.1 - , conduit == 0.5.2.4 + , conduit == 0.5.2.6 , cookie == 0.4.0.1 , cprng-aes == 0.2.4 , cpu == 0.1.1 @@ -49,36 +49,36 @@ library , entropy == 0.2.1 , failure == 0.2.0.1 , fast-logger == 0.3.1 - , file-embed == 0.0.4.5 + , file-embed == 0.0.4.6 , filesystem-conduit == 0.5.0.1 , hamlet == 1.1.1 , hashable == 1.1.2.5 - , hjsmin == 0.1.2 - , hspec == 1.3.0 + , hjsmin == 0.1.3 + , hspec == 1.3.0.1 , hspec-expectations == 0.3.0.2 , html-conduit == 0.1.0.2 - , http-conduit == 1.6.1 + , http-conduit == 1.6.1.2 , http-date == 0.0.2 , http-types == 0.7.3.0.1 - , language-javascript == 0.5.4 + , language-javascript == 0.5.5 , largeword == 1.0.3 - , lifted-base == 0.1.2 + , lifted-base == 0.2 , mime-mail == 0.4.1.2 , mime-types == 0.1.0.0 , monad-control == 0.3.1.4 , monad-logger == 0.2.1 - , network-conduit == 0.5.0.2 + , network-conduit == 0.6.1.1 , path-pieces == 0.1.2 , pem == 0.1.1 - , persistent == 1.0.1.2 + , persistent == 1.0.1.3 , persistent-template == 1.0.0.2 , pool-conduit == 0.1.0.3 - , primitive == 0.4.1 + , primitive == 0.5.0.1 , pureMD5 == 2.1.2.1 , pwstore-fast == 2.3 , ranges == 0.2.4 , resource-pool == 0.2.1.1 - , resourcet == 0.4.0.1 + , resourcet == 0.4.0.2 , safe == 0.3.3 , semigroups == 0.8.4.1 , shakespeare == 1.0.1.4 @@ -87,44 +87,44 @@ library , shakespeare-js == 1.0.0.6 , shakespeare-text == 1.0.0.5 , silently == 1.2.0.2 - , simple-sendfile == 0.2.7 + , simple-sendfile == 0.2.8 , skein == 0.1.0.9 , socks == 0.4.2 - , stringsearch == 0.3.6.3 + , stringsearch == 0.3.6.4 , system-fileio == 0.3.10 , system-filepath == 0.4.7 , tagged == 0.4.4 , tagsoup == 0.12.8 , tagstream-conduit == 0.5.3 - , tar == 0.4.0.0 + , tar == 0.4.0.1 , tls == 0.9.11 - , tls-extra == 0.4.6 + , tls-extra == 0.4.7 , transformers-base == 0.4.1 - , unix-compat == 0.3.0.2 + , unix-compat == 0.4.0.0 , unordered-containers == 0.2.2.1 , utf8-light == 0.4.0.1 , utf8-string == 0.3.7 , vault == 0.2.0.1 - , vector == 0.9.1 + , vector == 0.10.0.1 , void == 0.5.8 , wai == 1.3.0.1 , wai-app-static == 1.3.0.2 - , wai-extra == 1.3.0.2 + , wai-extra == 1.3.0.3 , wai-logger == 0.3.0 , wai-test == 1.3.0 - , warp == 1.3.2 + , warp == 1.3.4.1 , xml-conduit == 1.0.3.1 , xml-types == 0.3.3 , xss-sanitize == 0.3.2 - , yaml == 0.8.0.2 - , yesod == 1.1.1 - , yesod-auth == 1.1.1.1 - , yesod-core == 1.1.2 - , yesod-default == 1.1.0 + , yaml == 0.8.1 + , yesod == 1.1.2 + , yesod-auth == 1.1.1.2 + , yesod-core == 1.1.3.1 + , yesod-default == 1.1.0.2 , yesod-form == 1.1.3 , yesod-json == 1.1.0 , yesod-persistent == 1.1.0 - , yesod-routes == 1.1.0 + , yesod-routes == 1.1.0.2 , yesod-static == 1.1.0.1 , yesod-test == 0.3.0.1 , zlib-bindings == 0.1.1.1 From 9577083abde09646766c51fbb7c26e649ee92fb3 Mon Sep 17 00:00:00 2001 From: Luite Stegeman Date: Mon, 15 Oct 2012 14:53:33 +0300 Subject: [PATCH 03/14] update bounds so scaffold builds with GHC 7.6 --- yesod/scaffold/project.cabal.cg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg index 039c3719..106cc654 100644 --- a/yesod/scaffold/project.cabal.cg +++ b/yesod/scaffold/project.cabal.cg @@ -59,7 +59,7 @@ library , yesod-form >= 1.1 && < 1.2 , yesod-test >= 0.3 && < 0.4 , clientsession >= 0.8 && < 0.9 - , bytestring >= 0.9 && < 0.10 + , bytestring >= 0.9 && < 0.11 , text >= 0.11 && < 0.12 , persistent >= 1.0 && < 1.1 , persistent-~backendLower~ >= 1.0 && < 1.1 @@ -73,7 +73,7 @@ library , wai-extra >= 1.3 && < 1.4 , yaml >= 0.8 && < 0.9 , http-conduit >= 1.5 && < 1.7 - , directory >= 1.1 && < 1.2 + , directory >= 1.1 && < 1.3 , warp >= 1.3 && < 1.4 , data-default From dfae6618781ae9cc34954e9464e870ddfe0f87f3 Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Tue, 16 Oct 2012 13:51:22 +0200 Subject: [PATCH 04/14] Adept Hspec tests for forward compatibility * Don't use hspecX, it's deprecated. * Do not import Test.Hspec.HUnit. It's no longer necessary and may be removed in the future. --- yesod-core/test/YesodCoreTest/Cache.hs | 1 - yesod-core/test/YesodCoreTest/CleanPath.hs | 1 - yesod-core/test/YesodCoreTest/ErrorHandling.hs | 1 - yesod-core/test/YesodCoreTest/Exceptions.hs | 1 - yesod-core/test/YesodCoreTest/JsLoader.hs | 1 - yesod-core/test/YesodCoreTest/Links.hs | 1 - yesod-core/test/YesodCoreTest/Media.hs | 1 - yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs | 1 - yesod-core/test/YesodCoreTest/Widget.hs | 1 - yesod-core/test/YesodCoreTest/YesodTest.hs | 1 - yesod-form/test/main.hs | 6 ++---- yesod-form/yesod-form.cabal | 1 - yesod-routes/test/Hierarchy.hs | 5 ++--- yesod-routes/test/main.hs | 5 ++--- yesod-static/test/YesodStaticTest.hs | 5 +---- yesod-static/yesod-static.cabal | 1 - 16 files changed, 7 insertions(+), 26 deletions(-) diff --git a/yesod-core/test/YesodCoreTest/Cache.hs b/yesod-core/test/YesodCoreTest/Cache.hs index 3514f8f3..d12d0cc1 100644 --- a/yesod-core/test/YesodCoreTest/Cache.hs +++ b/yesod-core/test/YesodCoreTest/Cache.hs @@ -4,7 +4,6 @@ module YesodCoreTest.Cache (cacheTest, Widget) where import Test.Hspec -import Test.Hspec.HUnit() import Network.Wai import Network.Wai.Test diff --git a/yesod-core/test/YesodCoreTest/CleanPath.hs b/yesod-core/test/YesodCoreTest/CleanPath.hs index 572551cb..eb99ebd6 100644 --- a/yesod-core/test/YesodCoreTest/CleanPath.hs +++ b/yesod-core/test/YesodCoreTest/CleanPath.hs @@ -4,7 +4,6 @@ module YesodCoreTest.CleanPath (cleanPathTest, Widget) where import Test.Hspec -import Test.Hspec.HUnit() import Yesod.Core hiding (Request) diff --git a/yesod-core/test/YesodCoreTest/ErrorHandling.hs b/yesod-core/test/YesodCoreTest/ErrorHandling.hs index fdd1021f..eaf61b2f 100644 --- a/yesod-core/test/YesodCoreTest/ErrorHandling.hs +++ b/yesod-core/test/YesodCoreTest/ErrorHandling.hs @@ -6,7 +6,6 @@ module YesodCoreTest.ErrorHandling ) where import Yesod.Core import Test.Hspec -import Test.Hspec.HUnit() import Network.Wai import Network.Wai.Test import Text.Hamlet (hamlet) diff --git a/yesod-core/test/YesodCoreTest/Exceptions.hs b/yesod-core/test/YesodCoreTest/Exceptions.hs index 3ea0d720..f0942350 100644 --- a/yesod-core/test/YesodCoreTest/Exceptions.hs +++ b/yesod-core/test/YesodCoreTest/Exceptions.hs @@ -4,7 +4,6 @@ module YesodCoreTest.Exceptions (exceptionsTest, Widget) where import Test.Hspec -import Test.Hspec.HUnit () import Yesod.Core hiding (Request) import Network.Wai diff --git a/yesod-core/test/YesodCoreTest/JsLoader.hs b/yesod-core/test/YesodCoreTest/JsLoader.hs index 11b1a38d..1849d5b1 100644 --- a/yesod-core/test/YesodCoreTest/JsLoader.hs +++ b/yesod-core/test/YesodCoreTest/JsLoader.hs @@ -7,7 +7,6 @@ import YesodCoreTest.JsLoaderSites.HeadAsync (HA(..)) import YesodCoreTest.JsLoaderSites.Bottom (B(..)) import Test.Hspec -import Test.Hspec.HUnit () import Yesod.Core hiding (Request) import Network.Wai.Test diff --git a/yesod-core/test/YesodCoreTest/Links.hs b/yesod-core/test/YesodCoreTest/Links.hs index ddb95931..188cfe97 100644 --- a/yesod-core/test/YesodCoreTest/Links.hs +++ b/yesod-core/test/YesodCoreTest/Links.hs @@ -4,7 +4,6 @@ module YesodCoreTest.Links (linksTest, Widget) where import Test.Hspec -import Test.Hspec.HUnit () import Yesod.Core hiding (Request) import Text.Hamlet diff --git a/yesod-core/test/YesodCoreTest/Media.hs b/yesod-core/test/YesodCoreTest/Media.hs index cfd6aff8..490b6bdb 100644 --- a/yesod-core/test/YesodCoreTest/Media.hs +++ b/yesod-core/test/YesodCoreTest/Media.hs @@ -5,7 +5,6 @@ module YesodCoreTest.Media (mediaTest, Widget) where import Test.Hspec -import Test.Hspec.HUnit () import Yesod.Core hiding (Request) import Network.Wai import Network.Wai.Test diff --git a/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs b/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs index a3d8cd20..d68707cd 100644 --- a/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs +++ b/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs @@ -3,7 +3,6 @@ module YesodCoreTest.NoOverloadedStrings (noOverloadedTest, Widget) where import Test.Hspec -import Test.Hspec.HUnit () import Yesod.Core hiding (Request) import Network.Wai.Test diff --git a/yesod-core/test/YesodCoreTest/Widget.hs b/yesod-core/test/YesodCoreTest/Widget.hs index 842a43f0..dee452aa 100644 --- a/yesod-core/test/YesodCoreTest/Widget.hs +++ b/yesod-core/test/YesodCoreTest/Widget.hs @@ -4,7 +4,6 @@ module YesodCoreTest.Widget (widgetTest) where import Test.Hspec -import Test.Hspec.HUnit () import Yesod.Core hiding (Request) import Text.Julius diff --git a/yesod-core/test/YesodCoreTest/YesodTest.hs b/yesod-core/test/YesodCoreTest/YesodTest.hs index 46040f84..4cea7409 100644 --- a/yesod-core/test/YesodCoreTest/YesodTest.hs +++ b/yesod-core/test/YesodCoreTest/YesodTest.hs @@ -13,7 +13,6 @@ import Yesod.Core hiding (Request) import Network.Wai.Test import Network.Wai import Test.Hspec -import Test.Hspec.HUnit() yesod :: (YesodDispatch y y, Yesod y) => y -> Session a -> IO a yesod app f = toWaiApp app >>= runSession f diff --git a/yesod-form/test/main.hs b/yesod-form/test/main.hs index eed2a71f..72ef66ec 100644 --- a/yesod-form/test/main.hs +++ b/yesod-form/test/main.hs @@ -1,7 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} -import Test.HUnit -import Test.Hspec.Monadic -import Test.Hspec.HUnit () +import Test.Hspec import Data.Time (TimeOfDay (TimeOfDay)) import Data.Text (pack) @@ -10,7 +8,7 @@ import Yesod.Form.Types main :: IO () main = hspec $ - describe "parseTime" $ mapM_ (\(s, e) -> it s $ parseTime (pack s) @?= e) + describe "parseTime" $ mapM_ (\(s, e) -> it s $ parseTime (pack s) `shouldBe` e) [ ("01:00:00", Right $ TimeOfDay 1 0 0) , ("1:00", Right $ TimeOfDay 1 0 0) , ("1:00 AM", Right $ TimeOfDay 1 0 0) diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal index 05199e9d..6f5afaa6 100644 --- a/yesod-form/yesod-form.cabal +++ b/yesod-form/yesod-form.cabal @@ -64,7 +64,6 @@ test-suite test , yesod-form , time , hspec - , HUnit , text source-repository head diff --git a/yesod-routes/test/Hierarchy.hs b/yesod-routes/test/Hierarchy.hs index c272bb94..a4bf6316 100644 --- a/yesod-routes/test/Hierarchy.hs +++ b/yesod-routes/test/Hierarchy.hs @@ -14,8 +14,7 @@ module Hierarchy , toText ) where -import Test.Hspec.Monadic -import Test.Hspec.HUnit () +import Test.Hspec import Test.HUnit import Yesod.Routes.Parse import Yesod.Routes.TH @@ -92,7 +91,7 @@ getTableR _ t = append "TableR " t instance RunHandler Hierarchy master where runHandler h _ _ subRoute toMaster = (h, fmap toMaster subRoute) -hierarchy :: Specs +hierarchy :: Spec hierarchy = describe "hierarchy" $ do it "renders root correctly" $ renderRoute (AdminR 5 AdminRootR) @?= (["admin", "5"], []) diff --git a/yesod-routes/test/main.hs b/yesod-routes/test/main.hs index 1eff36a4..16db9be9 100644 --- a/yesod-routes/test/main.hs +++ b/yesod-routes/test/main.hs @@ -8,8 +8,7 @@ {-# LANGUAGE TypeSynonymInstances #-} {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE CPP #-} -import Test.Hspec.Monadic -import Test.Hspec.HUnit () +import Test.Hspec import Test.HUnit ((@?=)) import Data.Text (Text, pack, unpack, singleton) import Yesod.Routes.Dispatch hiding (Static, Dynamic) @@ -195,7 +194,7 @@ thDispatchAlias master sub toMaster app404 handler405 method0 pieces0 = -} main :: IO () -main = hspecX $ do +main = hspec $ do describe "justRoot" $ do it "dispatches correctly" $ test justRoot [] @?= Just 1 it "fails correctly" $ test justRoot ["foo"] @?= Nothing diff --git a/yesod-static/test/YesodStaticTest.hs b/yesod-static/test/YesodStaticTest.hs index 53e33bf6..e2a909fb 100644 --- a/yesod-static/test/YesodStaticTest.hs +++ b/yesod-static/test/YesodStaticTest.hs @@ -1,8 +1,6 @@ module YesodStaticTest (specs) where import Test.Hspec -import Test.HUnit ( (@?=) ) -import Test.Hspec.HUnit ( ) import Yesod.Static (getFileListPieces) @@ -10,5 +8,4 @@ specs :: Spec specs = do describe "get file list" $ do it "pieces" $ do - x <- getFileListPieces "test/fs" - x @?= [["foo"], ["bar", "baz"]] + getFileListPieces "test/fs" `shouldReturn` [["foo"], ["bar", "baz"]] diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index e94e6291..3d34b85a 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -46,7 +46,6 @@ test-suite tests cpp-options: -DTEST_EXPORT build-depends: base , hspec >= 1.3 && < 1.4 - , HUnit -- copy from above , containers , old-time From ffcf7fbc5d71530e7b3998fbfbcbc5e4a590ffa7 Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Tue, 16 Oct 2012 14:42:08 +0200 Subject: [PATCH 05/14] yesod-test: Do not use Test.Hspec.Runner Test.Hspec.Runner will export functions for monadic specs in the future (Hspec >= 1.4). --- yesod-test/Yesod/Test.hs | 19 ++++++++++++++++--- yesod-test/test/main.hs | 3 +-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs index ce5730bc..f41b4834 100644 --- a/yesod-test/Yesod/Test.hs +++ b/yesod-test/Yesod/Test.hs @@ -65,8 +65,22 @@ module Yesod.Test ( where +-- In in Hspec < 1.3 the Example instance for IO () (== Assertion/Expectation) +-- is orphan and only export from Test.Hspec.HUnit. +-- +-- In Hspec 1.3.* it is still orphan, but re-exported from Test.Hspec. +-- +-- Starting with Hspec 1.4.0 it is not orphan anymore. +-- +-- As we only support Hspec >= 1.3, we import Test.Hspec to bring the orphan +-- instance into scope. This is better than importing Test.Hspec.HUnit, as +-- Test.Hspec.HUnit may be removed in the future. +-- +-- As soon as we decide to drop support for Hspec 1.3.*, we can remove this +-- comment and the following import. +import qualified Test.Hspec () + import qualified Test.Hspec.Core as Core -import qualified Test.Hspec.Runner as Runner import qualified Data.List as DL import qualified Data.Maybe as DY import qualified Data.ByteString.Char8 as BS8 @@ -75,7 +89,6 @@ import qualified Data.Text as T import qualified Data.Text.Encoding as TE import qualified Data.ByteString.Lazy.Char8 as BSL8 import qualified Test.HUnit as HUnit -import qualified Test.Hspec.HUnit () import qualified Network.HTTP.Types as H import qualified Network.Socket.Internal as Sock import Data.CaseInsensitive (CI) @@ -143,7 +156,7 @@ type CookieValue = ByteString runTests :: Application -> Pool conn -> SpecsConn conn -> IO () runTests app connection specsDef = do (SpecsData _ _ specs) <- ST.execStateT specsDef (SpecsData app connection []) - Runner.hspec specs + Core.hspec specs -- | Start describing a Tests suite keeping cookies and a reference to the tested 'Application' -- and 'ConnectionPool' diff --git a/yesod-test/test/main.hs b/yesod-test/test/main.hs index fee911d7..cfcf9637 100644 --- a/yesod-test/test/main.hs +++ b/yesod-test/test/main.hs @@ -1,8 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE CPP #-} import Test.HUnit hiding (Test) -import Test.Hspec.Monadic -import Test.Hspec.HUnit () +import Test.Hspec import Yesod.Test.CssQuery import Yesod.Test.TransversingCSS From a337a8afd8ac9ae064dd645f8398b90de6ad66b4 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 18 Oct 2012 16:13:08 +0200 Subject: [PATCH 06/14] language-javascript update for yesod-platform --- yesod-platform/yesod-platform.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yesod-platform/yesod-platform.cabal b/yesod-platform/yesod-platform.cabal index e706d3f1..6ee7a725 100644 --- a/yesod-platform/yesod-platform.cabal +++ b/yesod-platform/yesod-platform.cabal @@ -1,5 +1,5 @@ name: yesod-platform -version: 1.1.4 +version: 1.1.4.1 license: MIT license-file: LICENSE author: Michael Snoyman @@ -32,7 +32,7 @@ library , cereal == 0.3.5.2 , certificate == 1.2.8 , clientsession == 0.8.0.1 - , conduit == 0.5.2.6 + , conduit == 0.5.2.7 , cookie == 0.4.0.1 , cprng-aes == 0.2.4 , cpu == 0.1.1 @@ -60,7 +60,7 @@ library , http-conduit == 1.6.1.2 , http-date == 0.0.2 , http-types == 0.7.3.0.1 - , language-javascript == 0.5.5 + , language-javascript == 0.5.6 , largeword == 1.0.3 , lifted-base == 0.2 , mime-mail == 0.4.1.2 From 6ff229664f4dc094c0f4b7a1f82193ef963f3f7a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 21 Oct 2012 14:12:27 +0200 Subject: [PATCH 07/14] http-conduit 1.7 --- yesod-auth/yesod-auth.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 8fed4d86..0230caad 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -1,5 +1,5 @@ name: yesod-auth -version: 1.1.1.2 +version: 1.1.1.3 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin @@ -34,7 +34,7 @@ library , persistent >= 1.0 && < 1.1 , persistent-template >= 1.0 && < 1.1 , SHA >= 1.4.1.3 && < 1.6 - , http-conduit >= 1.5 && < 1.7 + , http-conduit >= 1.5 && < 1.8 , aeson >= 0.5 , pwstore-fast >= 2.2 && < 3 , lifted-base >= 0.1 From 393133d1b6c1ec4d8132d0a8d3a5a32cc0c167ee Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 22 Oct 2012 07:27:19 +0200 Subject: [PATCH 08/14] Add missing test files for yesod-static (#438) --- yesod-static/yesod-static.cabal | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index 3d34b85a..f49fb1fa 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -14,6 +14,10 @@ description: Static file serving subsite for Yesod Web Framework. extra-source-files: test/YesodStaticTest.hs test/tests.hs + test/fs/bar/baz + test/fs/tmp/ignored + test/fs/.ignored + test/fs/foo library build-depends: base >= 4 && < 5 From 78ef9ae7d00171c0c74153de50ace64b56763de3 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 24 Oct 2012 15:18:59 +0200 Subject: [PATCH 09/14] http-conduit 1.8 --- yesod-auth/yesod-auth.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 0230caad..22b7ee78 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -1,5 +1,5 @@ name: yesod-auth -version: 1.1.1.3 +version: 1.1.1.4 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin @@ -34,7 +34,7 @@ library , persistent >= 1.0 && < 1.1 , persistent-template >= 1.0 && < 1.1 , SHA >= 1.4.1.3 && < 1.6 - , http-conduit >= 1.5 && < 1.8 + , http-conduit >= 1.5 && < 1.9 , aeson >= 0.5 , pwstore-fast >= 2.2 && < 3 , lifted-base >= 0.1 From f8497c3a22d9c4534bc051d43e032095557f95a9 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 24 Oct 2012 17:33:57 +0200 Subject: [PATCH 10/14] Put attributes on ^{inside} +^{inside} |]) -- outside @@ -335,7 +335,7 @@ $newline never $newline never