Add a single snap handler test

Author: qxjit

TODO

@@ -17,6 +17,7 @@
 -- OTHER IDEAS (EITHER R1 OR AFTER) --
 
 * Setup Snap Handler tests
+** Done for one test, need more tests
 
 * Multiple colors of cells based on user?
 

polygod.cabal

@@ -38,7 +38,8 @@ Executable polygod
     time >= 1.1.4 && < 2,
     containers,
     MonadCatchIO-transformers,
-    filepath >= 1.1 && <1.2
+    filepath >= 1.1 && < 1.2,
+    iteratee >= 0.3.5 && < 0.4
 
   extensions: BangPatterns, OverloadedStrings
 

src/WebApp.hs

@@ -21,18 +21,23 @@ worldWidth, worldHeight :: Dimension
 
 main :: IO ()
 main = do
-  timeline <- newTimeline (worldWidth, worldHeight) worldView
+  timeline <- newAppTimeline
   users <- newUserSet
 
   gliderGunPattern <- loadPattern "gospersGliderGun.txt"
   interfere (drawPatternAt (0, 0) gliderGunPattern) timeline
-  quickServer $
-        ifTop (rootHandler timeline) <|>
-        noCache (route [ ("world/current.json", worldHandler users timeline)
-                       , ("world/next.json", nextWorldHandler users timeline)
-                       , ("world", updateWorldHandler timeline)
-                       ]) <|>
-        fileServe "public"
+  quickServer $ site timeline users
+
+newAppTimeline :: IO (Timeline SharedTimelineView)
+newAppTimeline = newTimeline (worldWidth, worldHeight) worldView
+
+site :: Timeline SharedTimelineView -> UserSet -> Snap ()
+site timeline users = ifTop (rootHandler timeline) <|>
+                      noCache (route [ ("world/current.json", worldHandler users timeline)
+                                     , ("world/next.json", nextWorldHandler users timeline)
+                                     , ("world", updateWorldHandler timeline)
+                                     ]) <|>
+                      fileServe "public"
 
 noCache :: Snap () -> Snap ()
 noCache handler = do

src/WorldHandlers.hs

@@ -14,6 +14,7 @@ import           Life.JSON
 import           Timeline
 import           Util
 import           ConcurrentUsers
+import           WorldView
 
 updateWorldHandler :: Timeline a -> Snap ()
 updateWorldHandler timeline = do
@@ -32,13 +33,13 @@ generateNewUserToken userSet = do
   newUser <- liftIO (trackNewUser userSet)
   maybe (error500 "Failed to generate UUID" >> undefined) return newUser
 
-worldHandler :: UserSet -> Timeline (UserToken -> UserSet -> Snap ()) -> Snap ()
+worldHandler :: UserSet -> Timeline SharedTimelineView -> Snap ()
 worldHandler userSet timeline = do
   user <- generateNewUserToken userSet
   (_, _, renderWorldJson) <- liftIO (now timeline)
   renderWorldJson user userSet
 
-nextWorldHandler :: UserSet -> Timeline (UserToken -> UserSet -> Snap ()) -> Snap ()
+nextWorldHandler :: UserSet -> Timeline SharedTimelineView -> Snap ()
 nextWorldHandler userSet timeline = do
     userTokenParam <- getParam "u"
     user <- maybe (generateNewUserToken userSet)

src/WorldView.hs

@@ -1,5 +1,7 @@
 module WorldView
-  (worldView)
+  ( worldView
+  , SharedTimelineView
+  )
   where
 
 import           Control.Monad.Trans (liftIO)
@@ -13,7 +15,9 @@ import           Life
 import           Life.JSON
 import           Timeline
 
-worldView :: World -> Tick -> UserToken -> UserSet -> Snap ()
+type SharedTimelineView = UserToken -> UserSet -> Snap ()
+
+worldView :: World -> Tick -> SharedTimelineView
 worldView world tick userToken userSet = do
   count <- liftIO (userCount userSet)
   jsonTemplate $ worldViewJson world tick userToken count

test/Tests.hs

@@ -5,9 +5,10 @@ import Test.Framework (defaultMain)
 import qualified LifeTests as LifeTests
 import qualified Life.JSONTests as JSONTests
 import qualified TimelineTests as TimelineTests
+import qualified WebAppTests as WebAppTests
 import qualified ConcurrentUsersTests as ConcurrentUsersTests
 
 main :: IO ()
-main = defaultMain [ TimelineTests.tests, ConcurrentUsersTests.tests, LifeTests.tests, JSONTests.tests ]
+main = defaultMain [ TimelineTests.tests, ConcurrentUsersTests.tests, WebAppTests.tests, LifeTests.tests, JSONTests.tests ]
 
 

test/WebAppTests.hs

@@ -0,0 +1,48 @@
+module WebAppTests where
+
+import           TestHelper
+
+import qualified Data.Map as Map
+import qualified Data.ByteString as Strict
+import           Data.IORef
+
+import           Text.JSONb
+import           Snap.Iteratee
+import           Snap.Types
+import           Snap.Internal.Http.Types
+
+import           ConcurrentUsers
+import           WebApp
+
+tests :: Test
+tests = testGroup "WebApp" [
+  "renders valid json" `testCase` do
+    timeline <- newAppTimeline
+    users <- newUserSet
+    bodyRef <- newIORef (SomeEnumerator $ enumBS "")
+    let request = Request { rqServerName = "localhost",
+                            rqServerPort = 0,
+                            rqRemoteAddr = "127.0.0.1",
+                            rqRemotePort = 0,
+                            rqLocalAddr = "127.0.0.1",
+                            rqLocalPort = 0,
+                            rqLocalHostname = "localhost",
+                            rqIsSecure = False,
+                            rqHeaders = Map.empty,
+                            rqBody = bodyRef,
+                            rqContentLength = Nothing,
+                            rqMethod = GET,
+                            rqVersion = (1, 1),
+                            rqCookies = [],
+                            rqSnapletPath = "",
+                            rqPathInfo = "world/next.json",
+                            rqContextPath = "/",
+                            rqURI = "/world/next.json",
+                            rqQueryString = "tick=1",
+                            rqParams = Map.singleton "tick" ["1"]
+                          }
+    (_, testResponse) <- run (runSnap (site timeline users) (const $ return ()) request)
+    bodyIteratee <- (rspBodyToEnum $ rspBody testResponse) stream2list
+    !body <- run bodyIteratee
+    assertBool "Expected response to be parseable json" (either (const False) (const True) $ decode (Strict.pack body))
+  ]