From 095b05e4f97301355e20d81135dfb20142eb767f Mon Sep 17 00:00:00 2001 From: John MacFarlane <jgm@berkeley.edu> Date: Wed, 22 Apr 2015 17:38:59 -0700 Subject: [PATCH] EPUB tests: don't use joinPath, which varies across platforms. Instead, use a forward-slash to join paths, regardless of the platform. This matches the way MediaBag now works. See https://github.com/jgm/pandoc/commit/56e4ecab20613d86a6660547ed87e7ff4b80d632#commitcomment-10858449 --- tests/Tests/Readers/EPUB.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/Tests/Readers/EPUB.hs b/tests/Tests/Readers/EPUB.hs index bfdaa45b7..033352d51 100644 --- a/tests/Tests/Readers/EPUB.hs +++ b/tests/Tests/Readers/EPUB.hs @@ -8,7 +8,6 @@ import qualified Data.ByteString.Lazy as BL import Text.Pandoc.Readers.EPUB import Text.Pandoc.MediaBag (MediaBag, mediaDirectory) import Control.Applicative -import System.FilePath (joinPath) import Text.Pandoc.Error getMediaBag :: FilePath -> IO MediaBag @@ -24,7 +23,11 @@ testMediaBag fp bag = do (actBag == bag) featuresBag :: [(String, String, Int)] -featuresBag = [(joinPath ["img","check.gif"],"image/gif",1340),(joinPath ["img","check.jpg"],"image/jpeg",2661),(joinPath ["img","check.png"],"image/png",2815),(joinPath ["img","multiscripts_and_greek_alphabet.png"],"image/png",10060)] +featuresBag = [("img/check.gif","image/gif",1340) + ,("img/check.jpg","image/jpeg",2661) + ,("img/check.png","image/png",2815) + ,("img/multiscripts_and_greek_alphabet.png","image/png",10060) + ] tests :: [Test] tests =