From 8c183d9cdabd8bc7522fd179160884502dca419c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 27 Apr 2014 11:21:43 +0300 Subject: [PATCH] Another fix for UTF8 paths --- yesod-test/Yesod/Test.hs | 2 +- yesod-test/test/main.hs | 5 +++++ yesod-test/yesod-test.cabal | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs index ebe37a52..dad5795f 100644 --- a/yesod-test/Yesod/Test.hs +++ b/yesod-test/Yesod/Test.hs @@ -504,7 +504,7 @@ setUrl url' = do let (urlPath, urlQuery) = T.break (== '?') url ST.modify $ \rbd -> rbd { rbdPath = - case DL.filter (/="") $ T.split (== '/') urlPath of + case DL.filter (/="") $ H.decodePathSegments $ TE.encodeUtf8 urlPath of ("http:":_:rest) -> rest ("https:":_:rest) -> rest x -> x diff --git a/yesod-test/test/main.hs b/yesod-test/test/main.hs index d7ec787c..318148bc 100644 --- a/yesod-test/test/main.hs +++ b/yesod-test/test/main.hs @@ -113,6 +113,11 @@ main = hspec $ do get ("/dynamic1/שלום" :: Text) statusIs 200 bodyEquals "שלום" + yit "from path, type-safe URL" $ do + get $ LiteAppRoute ["dynamic1", "שלום"] + statusIs 200 + printBody + bodyEquals "שלום" yit "from WAI" $ do get ("/dynamic2/שלום" :: Text) statusIs 200 diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal index c83d1f51..e1c90492 100644 --- a/yesod-test/yesod-test.cabal +++ b/yesod-test/yesod-test.cabal @@ -1,5 +1,5 @@ name: yesod-test -version: 1.2.1.3 +version: 1.2.1.4 license: MIT license-file: LICENSE author: Nubis