diff --git a/test/YesodCoreTest/Widget.hs b/test/YesodCoreTest/Widget.hs --- a/test/YesodCoreTest/Widget.hs +++ b/test/YesodCoreTest/Widget.hs @@ -46,19 +46,6 @@ renderMessage a (_:xs) y = renderMessage a xs y renderMessage a [] y = renderMessage a ["en"] y -getTowidgetR :: Handler Html -getTowidgetR = defaultLayout $ do - toWidget [julius|foo|] :: Widget - toWidgetHead [julius|foo|] - toWidgetBody [julius|foo|] - - toWidget [lucius|foo{bar:baz}|] - toWidgetHead [lucius|foo{bar:baz}|] - - toWidget [hamlet||] - toWidgetHead [hamlet||] - toWidgetBody [hamlet||] - getWhamletR :: Handler Html getWhamletR = defaultLayout [whamlet| $newline never @@ -85,13 +72,31 @@ getJSHeadR :: Handler Html getJSHeadR = defaultLayout $ toWidgetHead [julius|alert("hello");|] +getTowidgetR :: Handler Html +getTowidgetR = defaultLayout $ do + toWidget [julius|toWidget|] :: Widget + toWidgetHead [julius|toHead|] + toWidgetBody [julius|toBody|] + + toWidget [lucius|toWidget{bar:baz}|] + toWidgetHead [lucius|toHead{bar:baz}|] + + toWidget [hamlet|

toWidget|] + toWidgetHead [hamlet||] + toWidgetBody [hamlet|

toBody|] + widgetTest :: Spec widgetTest = describe "Test.Widget" $ do - it "addJuliusBody" case_addJuliusBody - it "whamlet" case_whamlet - it "two letter lang codes" case_two_letter_lang - it "automatically applies toWidget" case_auto - it "toWidgetHead puts JS in head" case_jshead + it "addJuliusBody" case_addJuliusBody + it "whamlet" case_whamlet + it "two letter lang codes" case_two_letter_lang + it "automatically applies toWidget" case_auto + it "toWidgetHead puts JS in head" case_jshead + it "toWidget" $ runner $ do + res <- request defaultRequest + { pathInfo = ["towidget"] + } + assertBody "\n\n

toWidget

\n

toBody

\n" res runner :: Session () -> IO () runner f = toWaiApp Y >>= runSession f diff --git a/yesod-core.cabal b/yesod-core.cabal --- a/yesod-core.cabal +++ b/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.4.3 +version: 1.4.3.1 license: MIT license-file: LICENSE author: Michael Snoyman