diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-03-28 12:12:48 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-03-28 12:12:48 -0700 |
| commit | 6a3a04c4280817df39519bf1d73eee3b9e0b3841 (patch) | |
| tree | 304a696d66d3d8cfb6f1441086947c12f2cb1cb8 /tests/Tests/Writers/Docx.hs | |
| parent | d744b83b61bc635419339b73b687b9280ee757fc (diff) | |
| parent | ad39bc7009e320b3afb91a5683521eb1eccf0ef7 (diff) | |
| download | pandoc-6a3a04c4280817df39519bf1d73eee3b9e0b3841.tar.gz | |
Merge branch 'errortype' of https://github.com/mpickering/pandoc into mpickering-errortype
Conflicts:
benchmark/benchmark-pandoc.hs
src/Text/Pandoc/Readers/Markdown.hs
src/Text/Pandoc/Readers/Org.hs
src/Text/Pandoc/Readers/RST.hs
tests/Tests/Readers/LaTeX.hs
Diffstat (limited to 'tests/Tests/Writers/Docx.hs')
| -rw-r--r-- | tests/Tests/Writers/Docx.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/Tests/Writers/Docx.hs b/tests/Tests/Writers/Docx.hs index 80ce0014d..068c5a935 100644 --- a/tests/Tests/Writers/Docx.hs +++ b/tests/Tests/Writers/Docx.hs @@ -7,6 +7,7 @@ import Tests.Helpers import Test.Framework import Text.Pandoc.Readers.Docx import Text.Pandoc.Writers.Docx +import Text.Pandoc.Error type Options = (WriterOptions, ReaderOptions) @@ -15,9 +16,9 @@ compareOutput :: Options -> IO (Pandoc, Pandoc) compareOutput opts nativeFile = do nf <- Prelude.readFile nativeFile - df <- writeDocx (fst opts) (readNative nf) - let (p, _) = readDocx (snd opts) df - return (p, readNative nf) + df <- writeDocx (fst opts) (handleError $ readNative nf) + let (p, _) = handleError $ readDocx (snd opts) df + return (p, handleError $ readNative nf) testCompareWithOptsIO :: Options -> String -> FilePath -> IO Test testCompareWithOptsIO opts name nativeFile = do |