git.iko.soy/typeable/pandoc
on master help sign in
Command tests: small change to try to fix appveyor failures.
0ab26acJohn MacFarlane
test/Tests/Command.hs+4−3
compare with master
unifiedsplit
@@ -2,6 +2,7 @@ module Tests.Command (findPandoc, runTest, tests)
2where
2where
3
3
4import Data.Algorithm.Diff
4import Data.Algorithm.Diff
5+import qualified Data.Text as T
5import Data.List (isSuffixOf)
6import Data.List (isSuffixOf)
6import Prelude hiding (readFile)
7import Prelude hiding (readFile)
7import System.Directory
8import System.Directory
@@ -13,7 +14,6 @@ import Test.Tasty.HUnit
13import Tests.Helpers
14import Tests.Helpers
14import Text.Pandoc
15import Text.Pandoc
15import Text.Pandoc.Shared (trimr)
16import Text.Pandoc.Shared (trimr)
16−import qualified Data.ByteString as BS
17import qualified Text.Pandoc.UTF8 as UTF8
17import qualified Text.Pandoc.UTF8 as UTF8
18import System.IO.Unsafe (unsafePerformIO) -- TODO temporary
18import System.IO.Unsafe (unsafePerformIO) -- TODO temporary
19
19
@@ -84,9 +84,10 @@ runCommandTest pandocpath (num, code) =
84
84
85extractCommandTest :: FilePath -> FilePath -> TestTree
85extractCommandTest :: FilePath -> FilePath -> TestTree
86extractCommandTest pandocpath fp = unsafePerformIO $ do
86extractCommandTest pandocpath fp = unsafePerformIO $ do
87− contents <- UTF8.toText <$> BS.readFile ("command" </> fp)
87+ contents <- UTF8.readFile ("command" </> fp)
88 Pandoc _ blocks <- runIOorExplode (readMarkdown
88 Pandoc _ blocks <- runIOorExplode (readMarkdown
89− def{ readerExtensions = pandocExtensions } contents)
89+ def{ readerExtensions = pandocExtensions }
90+ (T.pack contents))
90 let codeblocks = map extractCode $ filter isCodeBlock $ blocks
91 let codeblocks = map extractCode $ filter isCodeBlock $ blocks
91 let cases = map (runCommandTest pandocpath) $ zip [1..] codeblocks
92 let cases = map (runCommandTest pandocpath) $ zip [1..] codeblocks
92 return $ testGroup fp cases
93 return $ testGroup fp cases