summaryrefslogtreecommitdiff
path: root/tests/Tests/Readers
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-04-22 17:38:59 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-04-22 17:38:59 -0700
commit095b05e4f97301355e20d81135dfb20142eb767f (patch)
tree50a71cb7025ea6f76d3100c73c15982f1f71d042 /tests/Tests/Readers
parente1d6be4e301cec74c3da26ea3a1ba0e21afe524e (diff)
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
Diffstat (limited to 'tests/Tests/Readers')
-rw-r--r--tests/Tests/Readers/EPUB.hs7
1 files 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 =