diff options
| author | Jasper Van der Jeugt <m@jaspervdj.be> | 2013-05-03 11:35:31 +0200 |
|---|---|---|
| committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2013-05-03 11:35:31 +0200 |
| commit | fbc23ee892b37c0bbc663e2531daa127dd091d30 (patch) | |
| tree | 4d40fdbda7f62ecc309c7d5b0f86e73575313b1f /tests | |
| parent | 6d47d9c895e368d1b730ef7abb0280db42b03d34 (diff) | |
| download | hakyll-fbc23ee892b37c0bbc663e2531daa127dd091d30.tar.gz | |
Update test suite
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Hakyll/Core/Routes/Tests.hs | 3 | ||||
| -rw-r--r-- | tests/Hakyll/Core/Rules/Tests.hs | 2 |
2 files changed, 3 insertions, 2 deletions
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 |