From 07557618345cb0f7c45299fce01c593149f2cd09 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 24 Apr 2012 18:57:14 +0300
Subject: [PATCH] Fix tests in scaffolding a bit

---
 yesod/Scaffolding/Scaffolder.hs     | 1 +
 yesod/scaffold/Application.hs.cg    | 1 +
 yesod/scaffold/cabal_test_suite.cg  | 2 +-
 yesod/scaffold/tests/HomeTest.hs.cg | 4 +++-
 yesod/scaffold/tests/main.hs.cg     | 2 ++
 yesod/yesod.cabal                   | 3 ++-
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index a730b408..897c0020 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -182,6 +182,7 @@ scaffold = do
     when useTests $ do
       mkDir "tests"
       writeFile' "tests/main.hs" $(codegen "tests/main.hs")
+      writeFile' "tests/HomeTest.hs" $(codegen "tests/HomeTest.hs")
 
     S.writeFile (dir ++ "/config/favicon.ico")
         $(runIO (S.readFile "scaffold/config/favicon.ico.cg") >>= \bs -> do
diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index b843b0fc..c69b4c74 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -2,6 +2,7 @@
 module Application
     ( makeApplication
     , getApplicationDev
+    , makeFoundation
     ) where
 
 import Import
diff --git a/yesod/scaffold/cabal_test_suite.cg b/yesod/scaffold/cabal_test_suite.cg
index a6b5eae2..038755d4 100644
--- a/yesod/scaffold/cabal_test_suite.cg
+++ b/yesod/scaffold/cabal_test_suite.cg
@@ -16,4 +16,4 @@ test-suite integration-tests
                 FlexibleContexts
 
     build-depends: base                          >= 4          && < 5
-                 , yesod-test                    >= 0.1        && < 0.2
+                 , yesod-test
diff --git a/yesod/scaffold/tests/HomeTest.hs.cg b/yesod/scaffold/tests/HomeTest.hs.cg
index b5ed0f72..17c9e6d3 100644
--- a/yesod/scaffold/tests/HomeTest.hs.cg
+++ b/yesod/scaffold/tests/HomeTest.hs.cg
@@ -1,4 +1,6 @@
-module TestHome (homeSpecs) where
+module HomeTest
+    ( homeSpecs
+    ) where
 
 import Import
 import Yesod.Test
diff --git a/yesod/scaffold/tests/main.hs.cg b/yesod/scaffold/tests/main.hs.cg
index 8ec0dd59..d475fe8c 100644
--- a/yesod/scaffold/tests/main.hs.cg
+++ b/yesod/scaffold/tests/main.hs.cg
@@ -11,6 +11,8 @@ import Yesod.Default.Config
 import Yesod.Test
 import Application (makeFoundation)
 
+import HomeTest
+
 main :: IO a
 main = do
     conf <- loadConfig $ (configSettings Testing) { csParseExtra = parseExtra }
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index dac53d51..e00648b6 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         1.0.1.2
+version:         1.0.1.3
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -31,6 +31,7 @@ extra-source-files:
   scaffold/Import.hs.cg
   scaffold/.ghci.cg
   scaffold/tests/main.hs.cg
+  scaffold/tests/HomeTest.hs.cg
   scaffold/Settings.hs.cg
   scaffold/Settings/StaticFiles.hs.cg
   scaffold/Application.hs.cg