diff options
| author | Jesse Rosenthal <jrosenthal@jhu.edu> | 2014-09-02 14:05:54 -0400 |
|---|---|---|
| committer | Jesse Rosenthal <jrosenthal@jhu.edu> | 2014-09-02 14:05:54 -0400 |
| commit | a6eead7f261ed47269e7f7e45b5774d8620e602b (patch) | |
| tree | a6a6da4f3f5cf61882176b46f69ae989ea3f10f6 /tests/Tests | |
| parent | 4ef850ded53c7e2bd815dbcb3d2e2b1af3b3de69 (diff) | |
| download | pandoc-a6eead7f261ed47269e7f7e45b5774d8620e602b.tar.gz | |
Docx reader: Modify mediabag test accordingly.
Diffstat (limited to 'tests/Tests')
| -rw-r--r-- | tests/Tests/Readers/Docx.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/Tests/Readers/Docx.hs b/tests/Tests/Readers/Docx.hs index 234b1b5b7..84da324b6 100644 --- a/tests/Tests/Readers/Docx.hs +++ b/tests/Tests/Readers/Docx.hs @@ -13,7 +13,6 @@ import Text.Pandoc.Writers.Native (writeNative) import qualified Data.Map as M import Text.Pandoc.MediaBag (MediaBag, lookupMedia, mediaDirectory) import Codec.Archive.Zip -import System.FilePath (combine) -- We define a wrapper around pandoc that doesn't normalize in the -- tests. Since we do our own normalization, we want to make sure @@ -60,7 +59,7 @@ testCompare = testCompareWithOpts def getMedia :: FilePath -> FilePath -> IO (Maybe B.ByteString) getMedia archivePath mediaPath = do zf <- B.readFile archivePath >>= return . toArchive - return $ findEntryByPath (combine "word" mediaPath) zf >>= (Just . fromEntry) + return $ findEntryByPath ("word/" ++ mediaPath) zf >>= (Just . fromEntry) compareMediaPathIO :: FilePath -> MediaBag -> FilePath -> IO Bool compareMediaPathIO mediaPath mediaBag docxPath = do |