summaryrefslogtreecommitdiff
path: root/src/Tests/Writers
diff options
context:
space:
mode:
authorKiwamu Okabe <kiwamu@debian.or.jp>2012-02-28 01:49:16 +0900
committerKiwamu Okabe <kiwamu@debian.or.jp>2012-02-28 01:49:16 +0900
commitb27a86d9758512d85d052a9a46917a54eb3da035 (patch)
tree43171a5211b250025cc85e6994a6a516aad5668f /src/Tests/Writers
parent6ac52ff209b172129452cd464d840b3c73c85c01 (diff)
Imported Upstream version 1.9.1.1
Diffstat (limited to 'src/Tests/Writers')
-rw-r--r--src/Tests/Writers/ConTeXt.hs6
-rw-r--r--src/Tests/Writers/HTML.hs4
-rw-r--r--src/Tests/Writers/Markdown.hs4
3 files changed, 6 insertions, 8 deletions
diff --git a/src/Tests/Writers/ConTeXt.hs b/src/Tests/Writers/ConTeXt.hs
index 704571e95..506ff698f 100644
--- a/src/Tests/Writers/ConTeXt.hs
+++ b/src/Tests/Writers/ConTeXt.hs
@@ -26,7 +26,7 @@ which is in turn shorthand for
test context "my test" (X,Y)
-}
-infix 5 =:
+infix 4 =:
(=:) :: (ToString a, ToPandoc a)
=> String -> (a, String) -> Test
(=:) = test context
@@ -43,9 +43,7 @@ tests = [ testGroup "inline code"
]
, testGroup "headers"
[ "level 1" =:
- header 1 "My header" =?> "\\subject{My header}"
- , property "header 1 property" $ \ils ->
- context' (header 1 ils) == "\\subject{" ++ context' ils ++ "}"
+ header 1 "My header" =?> "\\section[my-header]{My header}"
]
, testGroup "bullet lists"
[ "nested" =:
diff --git a/src/Tests/Writers/HTML.hs b/src/Tests/Writers/HTML.hs
index 3e1e0ddc2..8561aa421 100644
--- a/src/Tests/Writers/HTML.hs
+++ b/src/Tests/Writers/HTML.hs
@@ -23,7 +23,7 @@ which is in turn shorthand for
test html "my test" (X,Y)
-}
-infix 5 =:
+infix 4 =:
(=:) :: (ToString a, ToPandoc a)
=> String -> (a, String) -> Test
(=:) = test html
@@ -40,7 +40,7 @@ tests = [ testGroup "inline code"
]
, testGroup "images"
[ "alt with formatting" =:
- image "/url" "title" ("my " +++ emph "image")
+ image "/url" "title" ("my " <> emph "image")
=?> "<img src=\"/url\" title=\"title\" alt=\"my image\" />"
]
]
diff --git a/src/Tests/Writers/Markdown.hs b/src/Tests/Writers/Markdown.hs
index 70266a683..d90dc83b1 100644
--- a/src/Tests/Writers/Markdown.hs
+++ b/src/Tests/Writers/Markdown.hs
@@ -22,13 +22,13 @@ which is in turn shorthand for
test markdown "my test" (X,Y)
-}
-infix 5 =:
+infix 4 =:
(=:) :: (ToString a, ToPandoc a)
=> String -> (a, String) -> Test
(=:) = test markdown
tests :: [Test]
tests = [ "indented code after list"
- =: (orderedList [ para "one" +++ para "two" ] +++ codeBlock "test")
+ =: (orderedList [ para "one" <> para "two" ] <> codeBlock "test")
=?> "1. one\n\n two\n\n<!-- -->\n\n test"
]