From d61d7f19fc636f97e60f76b1ab0bd7a249cd96c3 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Wed, 23 Nov 2011 15:24:20 +0100 Subject: "Allow" missing keys in templates --- tests/Hakyll/Web/Template/Tests.hs | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) (limited to 'tests/Hakyll/Web/Template') diff --git a/tests/Hakyll/Web/Template/Tests.hs b/tests/Hakyll/Web/Template/Tests.hs index c772fa8..efbd392 100644 --- a/tests/Hakyll/Web/Template/Tests.hs +++ b/tests/Hakyll/Web/Template/Tests.hs @@ -16,29 +16,39 @@ import TestSuite.Util tests :: [Test] tests = fromAssertions "applyTemplate" -- Hakyll templates - [ applyTemplateAssertion readTemplate + [ applyTemplateAssertion readTemplate applyTemplate "bar" "$foo$" [("foo", "bar")] - , applyTemplateAssertion readTemplate + , applyTemplateAssertion readTemplate applyTemplate "$ barqux" "$$ $foo$$bar$" [("foo", "bar"), ("bar", "qux")] + , applyTemplateAssertion readTemplate applyTemplate + "$foo$" "$foo$" [] + -- Hamlet templates - , applyTemplateAssertion readHamletTemplate + , applyTemplateAssertion readHamletTemplate applyTemplate "noticeA paragraph" "#{title}\n\ \ Template) -- ^ Template parser - -> String -- ^ Expected - -> String -- ^ Template - -> [(String, String)] -- ^ Page - -> Assertion -- ^ Resulting assertion -applyTemplateAssertion parser expected template page = - expected @=? pageBody (applyTemplate (parser template) - (fromMap $ M.fromList page)) +applyTemplateAssertion :: (String -> Template) + -> (Template -> Page String -> Page String) + -> String + -> String + -> [(String, String)] + -> Assertion +applyTemplateAssertion parser apply expected template page = + expected @=? pageBody (apply (parser template) (fromMap $ M.fromList page)) -- cgit v1.2.3