diff options
| -rw-r--r-- | src/Hakyll/Core/Compiler.hs | 2 | ||||
| -rw-r--r-- | tests/Hakyll/Core/Identifier/Tests.hs | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/Hakyll/Core/Compiler.hs b/src/Hakyll/Core/Compiler.hs index 371594f..70e9a37 100644 --- a/src/Hakyll/Core/Compiler.hs +++ b/src/Hakyll/Core/Compiler.hs @@ -237,7 +237,7 @@ requireAll_ :: (Binary a, Typeable a, Writable a) -> Compiler b [a] requireAll_ pattern = fromDependencies (const getDeps) >>> fromJob requireAll_' where - getDeps = matches pattern . map unResource . resourceList + getDeps = filterMatches pattern . map unResource . resourceList requireAll_' = const $ CompilerM $ do deps <- getDeps . compilerResourceProvider <$> ask mapM (unCompilerM . getDependency) deps diff --git a/tests/Hakyll/Core/Identifier/Tests.hs b/tests/Hakyll/Core/Identifier/Tests.hs index 64b5abc..5b5d34d 100644 --- a/tests/Hakyll/Core/Identifier/Tests.hs +++ b/tests/Hakyll/Core/Identifier/Tests.hs @@ -10,18 +10,18 @@ import Hakyll.Core.Identifier.Pattern import TestSuite.Util tests :: [Test] -tests = fromAssertions "match" - [ Just ["bar"] @=? match "foo/**" "foo/bar" - , Just ["foo/bar"] @=? match "**" "foo/bar" - , Nothing @=? match "*" "foo/bar" - , Just [] @=? match "foo" "foo" - , Just ["foo"] @=? match "*/bar" "foo/bar" - , Just ["foo/bar"] @=? match "**/qux" "foo/bar/qux" - , Just ["foo/bar", "qux"] @=? match "**/*" "foo/bar/qux" - , Just ["foo", "bar/qux"] @=? match "*/**" "foo/bar/qux" - , Just ["foo"] @=? match "*.html" "foo.html" - , Nothing @=? match "*.html" "foo/bar.html" - , Just ["foo/bar"] @=? match "**.html" "foo/bar.html" - , Just ["foo/bar", "wut"] @=? match "**/qux/*" "foo/bar/qux/wut" - , Just ["lol", "fun/large"] @=? match "*cat/**.jpg" "lolcat/fun/large.jpg" +tests = fromAssertions "capture" + [ Just ["bar"] @=? capture "foo/**" "foo/bar" + , Just ["foo/bar"] @=? capture "**" "foo/bar" + , Nothing @=? capture "*" "foo/bar" + , Just [] @=? capture "foo" "foo" + , Just ["foo"] @=? capture "*/bar" "foo/bar" + , Just ["foo/bar"] @=? capture "**/qux" "foo/bar/qux" + , Just ["foo/bar", "qux"] @=? capture "**/*" "foo/bar/qux" + , Just ["foo", "bar/qux"] @=? capture "*/**" "foo/bar/qux" + , Just ["foo"] @=? capture "*.html" "foo.html" + , Nothing @=? capture "*.html" "foo/bar.html" + , Just ["foo/bar"] @=? capture "**.html" "foo/bar.html" + , Just ["foo/bar", "wut"] @=? capture "**/qux/*" "foo/bar/qux/wut" + , Just ["lol", "fun/large"] @=? capture "*cat/**.jpg" "lolcat/fun/large.jpg" ] |