Merge branch 'master' into dependency-analyzer

1 files changed, 26 insertions, 14 deletions

diff --git a/tests/Hakyll/Core/Identifier/Tests.hs b/tests/Hakyll/Core/Identifier/Tests.hs
index 64b5abc..0d7bfb8 100644
--- a/tests/Hakyll/Core/Identifier/Tests.hs
+++ b/tests/Hakyll/Core/Identifier/Tests.hs
@@ -10,18 +10,30 @@ 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 = concat
+    [ captureTests
+    , regexTests
+    ]
+
+captureTests :: [Test]
+captureTests = 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"
+    ]
+
+regexTests :: [Test]
+regexTests = fromAssertions "regex"
+    [ True  @=? matches (regex "^foo/[^x]*$") "foo/bar"
+    , False @=? matches (regex "^foo/[^x]*$") "foo/barx"
     ]