Merge branch 'master' into dev-metadata-route

Conflicts:
	tests/Hakyll/Core/Rules/Tests.hs

3 files changed, 28 insertions, 10 deletions

diff --git a/tests/Hakyll/Core/Rules/Tests.hs b/tests/Hakyll/Core/Rules/Tests.hs
index 908f712..6461b9d 100644
--- a/tests/Hakyll/Core/Rules/Tests.hs
+++ b/tests/Hakyll/Core/Rules/Tests.hs
@@ -10,7 +10,6 @@ import           Data.IORef                     (IORef, newIORef, readIORef,
                                                  writeIORef)
 import qualified Data.Set                       as S
 import           Test.Framework                 (Test, testGroup)
-import           Test.Framework.Providers.HUnit (testCase)
 import           Test.HUnit                     (Assertion, assert, (@=?))
 
 
@@ -28,18 +27,17 @@ import           TestSuite.Util
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "Hakyll.Core.Rules.Tests"
-    [ testCase "runRules" rulesTest
-    ]
+tests = testGroup "Hakyll.Core.Rules.Tests" $ fromAssertions "runRules"
+    [case01]
 
 
 --------------------------------------------------------------------------------
-rulesTest :: Assertion
-rulesTest = do
+case01 :: Assertion
+case01 = do
     ioref    <- newIORef False
     store    <- newTestStore
     provider <- newTestProvider store
-    ruleSet  <- runRules (rules ioref) provider
+    ruleSet  <- runRules (rules01 ioref) provider
     let identifiers     = S.fromList $ map fst $ rulesCompilers ruleSet
         routes          = rulesRoutes ruleSet
         checkRoute ex i =
@@ -66,8 +64,8 @@ rulesTest = do
 
 
 --------------------------------------------------------------------------------
-rules :: IORef Bool -> Rules ()
-rules ioref = do
+rules01 :: IORef Bool -> Rules ()
+rules01 ioref = do
     -- Compile some posts
     match "*.md" $ do
         route $ setExtension "html"
diff --git a/tests/Hakyll/Core/Runtime/Tests.hs b/tests/Hakyll/Core/Runtime/Tests.hs
index c68d99e..8a05824 100644
--- a/tests/Hakyll/Core/Runtime/Tests.hs
+++ b/tests/Hakyll/Core/Runtime/Tests.hs
@@ -20,7 +20,8 @@ import           TestSuite.Util
 
 --------------------------------------------------------------------------------
 tests :: Test
-tests = testGroup "Hakyll.Core.Runtime.Tests" $ fromAssertions "run" [case01]
+tests = testGroup "Hakyll.Core.Runtime.Tests" $
+    fromAssertions "run" [case01, case02]
 
 
 --------------------------------------------------------------------------------
@@ -48,3 +49,22 @@ case01 = do
     head (lines bodies) @?=  "This is an example."
 
     cleanTestEnv
+
+
+--------------------------------------------------------------------------------
+case02 :: Assertion
+case02 = do
+    _ <- run testConfiguration Logger.Error $ do
+        match "images/favicon.ico" $ do
+            route   $ gsubRoute "images/" (const "")
+            compile $ makeItem ("Test" :: String)
+
+        match "images/**" $ do
+            route   idRoute
+            compile copyFileCompiler
+
+    favicon <- readFile $
+        destinationDirectory testConfiguration </> "favicon.ico"
+    favicon @?= "Test"
+
+    cleanTestEnv
diff --git a/tests/data/images/favicon.ico b/tests/data/images/favicon.ico
new file mode 100644
index 0000000..fc2cca2
--- /dev/null
+++ b/tests/data/images/favicon.ico