git.iko.soy/typeable/pandoc
on master help sign in
Docx reader: Modify mediabag test accordingly.
commita6eead7f261ed47269e7f7e45b5774d8620e602b authorJesse Rosenthal <jrosenthal@jhu.edu> dateTue 2 Sep 2014, 14:05 (12 years ago) parent4ef850d
1 file changed+1−2
tests/Tests/Readers/Docx.hs+1−2
tests/Tests/Readers/Docx.hs+1−2
@@ -13,7 +13,6 @@ import Text.Pandoc.Writers.Native (writeNative)
1313import qualified Data.Map as M
1414import Text.Pandoc.MediaBag (MediaBag, lookupMedia, mediaDirectory)
1515import Codec.Archive.Zip
16−import System.FilePath (combine)
1716
1817-- We define a wrapper around pandoc that doesn't normalize in the
1918-- tests. Since we do our own normalization, we want to make sure
@@ -60,7 +59,7 @@ testCompare = testCompareWithOpts def
6059getMedia :: FilePath -> FilePath -> IO (Maybe B.ByteString)
6160getMedia archivePath mediaPath = do
6261 zf <- B.readFile archivePath >>= return . toArchive
63− return $ findEntryByPath (combine "word" mediaPath) zf >>= (Just . fromEntry)
62+ return $ findEntryByPath ("word/" ++ mediaPath) zf >>= (Just . fromEntry)
6463
6564compareMediaPathIO :: FilePath -> MediaBag -> FilePath -> IO Bool
6665compareMediaPathIO mediaPath mediaBag docxPath = do