on master help sign in
get test apps going
commitc0cea0d61ef8cdb94a86a8e67e1b49a3c6d9c3cd authorGreg Weber <greg@gregweber.info> dateWed 17 Aug 2011, 08:04 (15 years ago) parentdcf9050
5 files changed+20−15
wai-handler-devel/TestApp.hs → wai-handler-devel/FullApp.hs+13−9 wai-handler-devel/Testapp.hs → wai-handler-devel/SmallApp.hs+3−2 wai-handler-devel/run-testapp.hs → wai-handler-devel/run-fullapp.hs+1−1 wai-handler-devel/run-smallapp.hs+3 wai-handler-devel/testapp.hs−3
wai-handler-devel/TestApp.hs → wai-handler-devel/FullApp.hsrenamed+13−9
@@ -1,17 +1,21 @@
1−{-# LANGUAGE QuasiQuotes, TypeFamilies, GeneralizedNewtypeDeriving #-}
1+{-# LANGUAGE QuasiQuotes, TypeFamilies, GeneralizedNewtypeDeriving, GADTs #-}
22{-# LANGUAGE TemplateHaskell #-}
33{-# LANGUAGE OverloadedStrings #-}
4−module TestApp (testApp) where
4+module FullApp (fullApp) where
55
66import Network.Wai
7+import Network.HTTP.Types
78import Data.ByteString.Lazy.Char8 (pack)
9+import Database.Persist.TH
810import Database.Persist.Sqlite
911import System.Directory
1012import Control.Monad (when)
1113import Helper
1214import Text.Hamlet
15+import Text.Blaze.Renderer.Text (renderHtml)
16+import Data.Text.Lazy.Encoding (encodeUtf16LE)
1317
14−mkPersist [$persist|
18+mkPersist sqlSettings [persist|
1519Dummy
1620 dummy String
1721|]
@@ -19,10 +23,10 @@ Dummy
1923testApp handler = do
2024 putStrLn "testApp called, this should happen only once per reload"
2125 -- Swap between the following two lines as necessary to generate errors
22− exi <- doesFileExist db
26+ exi <- doesFileExist "db"
2327 --let exi = True
24− when exi $ removeFile db
25− withSqlitePool db 10 $ \pool -> do
28+ when exi $ removeFile "db"
29+ withSqlitePool "db" 10 $ \pool -> do
2630 flip runSqlPool pool $ runMigration $ migrate $ Dummy ""
2731 handler $ \req -> do
2832 if pathInfo req == "/favicon.ico"
@@ -34,7 +38,7 @@ testApp handler = do
3438 insert $ Dummy ""
3539 count ([] :: [Filter Dummy])
3640 return $ responseLBS status200
37− [("Content-Type", "text/html; charset=utf-8")]
38− $ renderHamlet id
39− $(hamletFile "hamlet/testapp.hamlet")
41+ [("Content-Type", "text/html; charset=utf-8")] $
42+ encodeUtf16LE $ renderHtml
43+ $(htmlFile "hamlet/testapp.hamlet")
4044 putStrLn "handler completed, this should only happen at the beginning of a reload"
wai-handler-devel/Testapp.hs → wai-handler-devel/SmallApp.hsrenamed+3−2
@@ -1,9 +1,10 @@
11{-# LANGUAGE OverloadedStrings #-}
2−module Testapp where
2+module SmallApp where
33
44import Network.Wai
5+import Network.HTTP.Types
56import Data.ByteString.Lazy.Char8 ()
67
78testapp' _ = return $ responseLBS status200 [("Content-Type", "text/html")] "test"
89
9−testapp f = f testapp'
10+smallApp f = f testapp'
wai-handler-devel/run-testapp.hs → wai-handler-devel/run-fullapp.hsrenamed+1−1
@@ -2,4 +2,4 @@ import Network.Wai.Handler.DevelServer (runQuit)
22import Data.Enumerator (Iteratee)
33import Data.ByteString (ByteString)
44
5−main = runQuit 3000 "TestApp2" "testapp" (const $ return ["hamlet/testapp.hamlet"])
5+main = runQuit 3000 "FullApp" "fullApp" (const $ return ["hamlet/testapp.hamlet"])
wai-handler-devel/run-smallapp.hsnew file+3
@@ -0,0 +1,3 @@
1+import Network.Wai.Handler.DevelServer (runQuit)
2+
3+main = runQuit 3000 "SmallApp" "smallApp" (const $ return [])
wai-handler-devel/testapp.hsdeleted−3
@@ -1,3 +0,0 @@
1−import Network.Wai.Handler.DevelServer (runQuit)
2−
3−main = runQuit 3000 "Testapp" "testapp" (const $ return [])