aboutsummaryrefslogtreecommitdiff
path: root/tests/Tests/Writers/Docx.hs
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-03-28 12:15:09 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-03-28 12:15:09 -0700
commitb74af6762d4a3c98be741af50fd3f3ac4344bef0 (patch)
treef7d27a6338824283957213438099b6a1269e4667 /tests/Tests/Writers/Docx.hs
parent6f4018f8d36ce641a5a67a6dff14de99e662a08f (diff)
parent6a3a04c4280817df39519bf1d73eee3b9e0b3841 (diff)
downloadpandoc-b74af6762d4a3c98be741af50fd3f3ac4344bef0.tar.gz
Merge branch 'mpickering-errortype'
Diffstat (limited to 'tests/Tests/Writers/Docx.hs')
-rw-r--r--tests/Tests/Writers/Docx.hs7
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