on master help sign in
Update test suite
fbc23eeJasper Van der Jeugt
tests/Hakyll/Core/Routes/Tests.hs+2−1
@@ -39,5 +39,6 @@ tests = testGroup "Hakyll.Core.Routes.Tests" $ fromAssertions "runRoutes"
39--------------------------------------------------------------------------------
39--------------------------------------------------------------------------------
40testRoutes :: FilePath -> Routes -> Identifier -> Assertion
40testRoutes :: FilePath -> Routes -> Identifier -> Assertion
41testRoutes expected r id' = do
41testRoutes expected r id' = do
42+ (route, _) <- runRoutes r
42− route <- runRoutes r (error "Hakyll.Core.Routes.Tests: no provider") id'
43+ (error "Hakyll.Core.Routes.Tests: no provider") id'
43 Just expected @=? route
44 Just expected @=? route
tests/Hakyll/Core/Rules/Tests.hs+1−1
@@ -41,7 +41,7 @@ case01 = do
41 let identifiers = S.fromList $ map fst $ rulesCompilers ruleSet
41 let identifiers = S.fromList $ map fst $ rulesCompilers ruleSet
42 routes = rulesRoutes ruleSet
42 routes = rulesRoutes ruleSet
43 checkRoute ex i =
43 checkRoute ex i =
44− runRoutes routes provider i >>= \r -> Just ex @=? r
44+ runRoutes routes provider i >>= \(r, _) -> Just ex @=? r
45
45
46 -- Test that we have some identifiers and that the routes work out
46 -- Test that we have some identifiers and that the routes work out
47 assert $ all (`S.member` identifiers) expected
47 assert $ all (`S.member` identifiers) expected