From fbc23ee892b37c0bbc663e2531daa127dd091d30 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Fri, 3 May 2013 11:35:31 +0200 Subject: Update test suite --- tests/Hakyll/Core/Routes/Tests.hs | 3 ++- tests/Hakyll/Core/Rules/Tests.hs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/Hakyll/Core/Routes/Tests.hs b/tests/Hakyll/Core/Routes/Tests.hs index c14a878..c681c99 100644 --- a/tests/Hakyll/Core/Routes/Tests.hs +++ b/tests/Hakyll/Core/Routes/Tests.hs @@ -39,5 +39,6 @@ tests = testGroup "Hakyll.Core.Routes.Tests" $ fromAssertions "runRoutes" -------------------------------------------------------------------------------- testRoutes :: FilePath -> Routes -> Identifier -> Assertion testRoutes expected r id' = do - route <- runRoutes r (error "Hakyll.Core.Routes.Tests: no provider") id' + (route, _) <- runRoutes r + (error "Hakyll.Core.Routes.Tests: no provider") id' Just expected @=? route diff --git a/tests/Hakyll/Core/Rules/Tests.hs b/tests/Hakyll/Core/Rules/Tests.hs index 6461b9d..12258f9 100644 --- a/tests/Hakyll/Core/Rules/Tests.hs +++ b/tests/Hakyll/Core/Rules/Tests.hs @@ -41,7 +41,7 @@ case01 = do let identifiers = S.fromList $ map fst $ rulesCompilers ruleSet routes = rulesRoutes ruleSet checkRoute ex i = - runRoutes routes provider i >>= \r -> Just ex @=? r + runRoutes routes provider i >>= \(r, _) -> Just ex @=? r -- Test that we have some identifiers and that the routes work out assert $ all (`S.member` identifiers) expected -- cgit v1.2.3