From 20efbebe4e04e1ed429da685bd45f9dcffa5c062 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sun, 22 Dec 2013 17:10:17 -0800
Subject: [PATCH] test cases for multiple method routes

---
 yesod-core/test/YesodCoreTest/Redirect.hs | 10 +++++++++-
 yesod-routes/test/Hierarchy.hs            | 22 +++++++++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/yesod-core/test/YesodCoreTest/Redirect.hs b/yesod-core/test/YesodCoreTest/Redirect.hs
index 3980cbc8..bfe9b35a 100644
--- a/yesod-core/test/YesodCoreTest/Redirect.hs
+++ b/yesod-core/test/YesodCoreTest/Redirect.hs
@@ -7,7 +7,7 @@ import qualified Network.HTTP.Types as H
 
 data Y = Y
 mkYesod "Y" [parseRoutes|
-/ RootR GET
+/ RootR GET POST
 /r301 R301 GET
 /r303 R303 GET
 /r307 R307 GET
@@ -20,6 +20,9 @@ app = yesod Y
 getRootR :: Handler ()
 getRootR = return ()
 
+postRootR :: Handler ()
+postRootR = return ()
+
 getR301, getR303, getR307, getRRegular :: Handler ()
 getR301 = redirectWith H.status301 RootR
 getR303 = redirectWith H.status303 RootR
@@ -28,6 +31,11 @@ getRRegular = redirect RootR
 
 specs :: Spec
 specs = describe "Redirect" $ do
+    it "no redirect" $ app $ do
+      res <- request defaultRequest { pathInfo = [], requestMethod = "POST" }
+      assertStatus 200 res
+      assertBodyContains "" res
+
     it "301 redirect" $ app $ do
       res <- request defaultRequest { pathInfo = ["r301"] }
       assertStatus 301 res
diff --git a/yesod-routes/test/Hierarchy.hs b/yesod-routes/test/Hierarchy.hs
index fdec53c5..bba12cdf 100644
--- a/yesod-routes/test/Hierarchy.hs
+++ b/yesod-routes/test/Hierarchy.hs
@@ -24,7 +24,7 @@ import Yesod.Routes.TH
 import Yesod.Routes.Class
 import Language.Haskell.TH.Syntax
 import qualified Yesod.Routes.Class as YRC
-import Data.Text (Text, pack, append)
+import Data.Text (Text, pack, unpack, append)
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as S8
 
@@ -87,6 +87,7 @@ do
   /spaces      SpacedR   GET
 
   /nest2 Nest2:
+    /           GetPostR  GET POST
     /get        Get2      GET
     /post       Post2         POST
 --    /#Int       Delete2            DELETE
@@ -152,6 +153,13 @@ postLoginR i = pack $ "post login: " ++ show i
 getTableR :: Int -> Text -> Handler site Text
 getTableR _ = append "TableR "
 
+getGetPostR :: Handler site Text
+getGetPostR = pack "get"
+
+postGetPostR :: Handler site Text
+postGetPostR = pack "post"
+
+
 hierarchy :: Spec
 hierarchy = describe "hierarchy" $ do
     it "nested with spacing" $
@@ -167,6 +175,18 @@ hierarchy = describe "hierarchy" $ do
                 , envSub = Hierarchy
                 })
             (map pack ps, S8.pack m)
+
+    let testGetPost route getRes postRes = do
+          let routeStrs = map unpack $ fst (renderRoute route)
+          disp "GET" routeStrs @?= (getRes, Just route)
+          disp "POST" routeStrs @?= (postRes, Just route)
+
+    it "dispatches routes with multiple METHODs: admin" $
+        testGetPost (AdminR 1 LoginR) "login: 1" "post login: 1"
+
+    it "dispatches routes with multiple METHODs: nesting" $
+        testGetPost (NestR $ Nest2 GetPostR) "get" "post"
+
     it "dispatches root correctly" $ disp "GET" ["admin", "7"] @?= ("admin root: 7", Just $ AdminR 7 AdminRootR)
     it "dispatches table correctly" $ disp "GET" ["admin", "8", "table", "bar"] @?= ("TableR bar", Just $ AdminR 8 $ TableR "bar")
     it "parses" $ do