From 494b2be2998ef04b10b869d7b898c1f84b8a4994 Mon Sep 17 00:00:00 2001 From: gregwebs Date: Fri, 16 Mar 2012 21:18:41 -0700 Subject: [PATCH] cleanup test branch --- package-list.sh | 3 +-- yesod-test/yesod-test.cabal | 6 +++--- yesod/Scaffolding/Scaffolder.hs | 4 +--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package-list.sh b/package-list.sh index a9b56aa6..abbfbfa3 100644 --- a/package-list.sh +++ b/package-list.sh @@ -10,5 +10,4 @@ pkgs=( ./yesod-routes ./yesod-auth ./yesod-sitemap ./yesod-default - ./yesod - ./yesod-test ) + ./yesod ) diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal index 754d99b0..293839a5 100644 --- a/yesod-test/yesod-test.cabal +++ b/yesod-test/yesod-test.cabal @@ -23,10 +23,10 @@ library build-depends: base >= 4 && < 4.3 build-depends: hxt >= 9.1.6 , parsec >= 2.1 && < 4 - , persistent >= 0.7 && < 0.8 + , persistent >= 0.8 && < 0.9 , transformers >= 0.2.2 && < 0.3 - , wai >= 1.0 && < 1.1 - , wai-test >= 1.0 && < 1.1 + , wai >= 1.1 && < 1.2 + , wai-test >= 1.0 && < 2.0 , network >= 2.2 && < 2.4 , http-types >= 0.6 && < 0.7 , HUnit >= 1.2 && < 1.3 diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs index af79fddd..d386c203 100644 --- a/yesod/Scaffolding/Scaffolder.hs +++ b/yesod/Scaffolding/Scaffolder.hs @@ -84,9 +84,7 @@ scaffold = do backendLower = uncapitalize $ show backend upper = show backend - puts $(codegenDir "input" "use-tests") - useTestsC <- prompt $ flip elem $ [return 'y', return 'n'] - let useTests = useTestsC == "y" + let useTests = True let testsDep = if useTests then ", yesod-test" else "" let runMigration =