$forall msg <- ia
@@ -498,12 +502,14 @@
defaultErrorHandler (InternalError e) =
applyLayout' "Internal Server Error"
[hamlet|
+$newline never
Internal Server Error
#{e}
|]
defaultErrorHandler (BadMethod m) =
applyLayout' "Bad Method"
[hamlet|
+$newline never
Method Not Supported
Method "#{S8.unpack m}" not supported
|]
@@ -521,7 +527,7 @@
return $ if x == Authorized then Just r else Nothing
jsToHtml :: Javascript -> Html
-jsToHtml (Javascript b) = preEscapedLazyText $ toLazyText b
+jsToHtml (Javascript b) = preEscapedToMarkup $ toLazyText b
jelper :: JavascriptUrl url -> HtmlUrl url
jelper = fmap jsToHtml
@@ -549,7 +555,7 @@
$ encodeUtf8 rendered
return (mmedia,
case x of
- Nothing -> Left $ preEscapedLazyText rendered
+ Nothing -> Left $ preEscapedToMarkup rendered
Just y -> Right $ either id (uncurry render) y)
jsLoc <-
case jscript of
@@ -563,6 +569,7 @@
-- the asynchronous loader means your page doesn't have to wait for all the js to load
let (mcomplete, asyncScripts) = asyncHelper render scripts jscript jsLoc
regularScriptLoad = [hamlet|
+$newline never
$forall s <- scripts
^{mkScriptTag s}
$maybe j <- jscript
@@ -573,6 +580,7 @@
|]
headAll = [hamlet|
+$newline never
\^{head'}
$forall s <- stylesheets
^{mkLinkTag s}
@@ -595,6 +603,7 @@
^{regularScriptLoad}
|]
let bodyScript = [hamlet|
+$newline never
^{body}
^{regularScriptLoad}
|]
@@ -641,6 +650,7 @@
loadJsYepnope :: Yesod master => Either Text (Route master) -> [Text] -> Maybe (HtmlUrl (Route master)) -> (HtmlUrl (Route master))
loadJsYepnope eyn scripts mcomplete =
[hamlet|
+$newline never
$maybe yn <- left eyn
" res
- , it "link from head async" $ runner HA $ do
+ it "link from head async" $ runner HA $ do
res <- request defaultRequest
assertBody "\n" res
- , it "link from bottom" $ runner B $ do
+ it "link from bottom" $ runner B $ do
res <- request defaultRequest
assertBody "\n" res
- ]
runner :: (YesodDispatch master master, Yesod master) => master -> Session () -> IO ()
runner app f = toWaiApp app >>= runSession f
diff --git a/test/YesodCoreTest/Links.hs b/test/YesodCoreTest/Links.hs
--- a/test/YesodCoreTest/Links.hs
+++ b/test/YesodCoreTest/Links.hs
@@ -21,9 +21,8 @@
getRootR = defaultLayout $ toWidget [hamlet||]
linksTest :: Spec
-linksTest = describe "Test.Links"
- [ it "linkToHome" case_linkToHome
- ]
+linksTest = describe "Test.Links" $ do
+ it "linkToHome" case_linkToHome
runner :: Session () -> IO ()
runner f = toWaiApp Y >>= runSession f
@@ -31,4 +30,4 @@
case_linkToHome :: IO ()
case_linkToHome = runner $ do
res <- request defaultRequest
- assertBody "\n" res
+ assertBody "\n\n" res
diff --git a/test/YesodCoreTest/Media.hs b/test/YesodCoreTest/Media.hs
--- a/test/YesodCoreTest/Media.hs
+++ b/test/YesodCoreTest/Media.hs
@@ -50,7 +50,6 @@
flip assertBody res "\n"
mediaTest :: Spec
-mediaTest = describe "Test.Media"
- [ it "media" caseMedia
- , it "media link" caseMediaLink
- ]
+mediaTest = describe "Test.Media" $ do
+ it "media" caseMedia
+ it "media link" caseMediaLink
diff --git a/test/YesodCoreTest/NoOverloadedStrings.hs b/test/YesodCoreTest/NoOverloadedStrings.hs
--- a/test/YesodCoreTest/NoOverloadedStrings.hs
+++ b/test/YesodCoreTest/NoOverloadedStrings.hs
@@ -45,6 +45,5 @@
assertBody mempty res
noOverloadedTest :: Spec
-noOverloadedTest = describe "Test.NoOverloadedStrings"
- [ it "sanity" case_sanity
- ]
+noOverloadedTest = describe "Test.NoOverloadedStrings" $ do
+ it "sanity" case_sanity
diff --git a/test/YesodCoreTest/Redirect.hs b/test/YesodCoreTest/Redirect.hs
--- a/test/YesodCoreTest/Redirect.hs
+++ b/test/YesodCoreTest/Redirect.hs
@@ -27,33 +27,32 @@
getRRegular = redirect RootR
specs :: Spec
-specs = describe "Redirect" [
+specs = describe "Redirect" $ do
it "301 redirect" $ app $ do
res <- request defaultRequest { pathInfo = ["r301"] }
assertStatus 301 res
assertBodyContains "" res
- , it "303 redirect" $ app $ do
+ it "303 redirect" $ app $ do
res <- request defaultRequest { pathInfo = ["r303"] }
assertStatus 303 res
assertBodyContains "" res
- , it "307 redirect" $ app $ do
+ it "307 redirect" $ app $ do
res <- request defaultRequest { pathInfo = ["r307"] }
assertStatus 307 res
assertBodyContains "" res
- , it "303 redirect for regular, HTTP 1.1" $ app $ do
+ it "303 redirect for regular, HTTP 1.1" $ app $ do
res <- request defaultRequest {
pathInfo = ["rregular"]
}
assertStatus 303 res
assertBodyContains "" res
- , it "302 redirect for regular, HTTP 1.0" $ app $ do
+ it "302 redirect for regular, HTTP 1.0" $ app $ do
res <- request defaultRequest {
pathInfo = ["rregular"]
, httpVersion = H.http10
}
assertStatus 302 res
assertBodyContains "" res
- ]
diff --git a/test/YesodCoreTest/WaiSubsite.hs b/test/YesodCoreTest/WaiSubsite.hs
--- a/test/YesodCoreTest/WaiSubsite.hs
+++ b/test/YesodCoreTest/WaiSubsite.hs
@@ -26,14 +26,13 @@
getRootR = return ()
specs :: Spec
-specs = describe "WaiSubsite" [
+specs = describe "WaiSubsite" $ do
it "root" $ app $ do
res <- request defaultRequest { pathInfo = [] }
assertStatus 200 res
assertBodyContains "" res
- , it "subsite" $ app $ do
+ it "subsite" $ app $ do
res <- request defaultRequest { pathInfo = ["sub", "foo"] }
assertStatus 200 res
assertBodyContains "WAI" res
- ]
diff --git a/test/YesodCoreTest/Widget.hs b/test/YesodCoreTest/Widget.hs
--- a/test/YesodCoreTest/Widget.hs
+++ b/test/YesodCoreTest/Widget.hs
@@ -56,12 +56,13 @@
toWidget [lucius|foo{bar:baz}|]
toWidgetHead [lucius|foo{bar:baz}|]
- toWidget [hamlet||] :: Widget
+ toWidget [hamlet||]
toWidgetHead [hamlet||]
toWidgetBody [hamlet||]
getWhamletR :: Handler RepHtml
getWhamletR = defaultLayout [whamlet|
+$newline never