From 7e99178a097ad824c60c72f8f289626dff04e0ff Mon Sep 17 00:00:00 2001 From: John MacFarlane <jgm@berkeley.edu> Date: Thu, 5 Apr 2018 10:13:15 -0700 Subject: Changes to tests to accommodate changes in pandoc-types. In https://github.com/jgm/pandoc-types/pull/36 we changed the table builder to pad cells. This commit changes tests (and two readers) to accord with this behavior. --- test/Tests/Writers/Muse.hs | 6 ++++-- test/docx/table_variable_width.native | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/Tests/Writers/Muse.hs b/test/Tests/Writers/Muse.hs index 115a00f83..96f506cd5 100644 --- a/test/Tests/Writers/Muse.hs +++ b/test/Tests/Writers/Muse.hs @@ -267,7 +267,8 @@ tests = [ testGroup "block elements" [ "table without header" =: let rows = [[para $ text "Para 1.1", para $ text "Para 1.2"] ,[para $ text "Para 2.1", para $ text "Para 2.2"]] - in simpleTable [] rows + in table mempty [(AlignDefault,0.0),(AlignDefault,0.0)] + [mempty, mempty] rows =?> unlines [ " Para 1.1 | Para 1.2" , " Para 2.1 | Para 2.2" @@ -287,7 +288,8 @@ tests = [ testGroup "block elements" headers = [plain $ text "header 1", plain $ text "header 2"] rows = [[para $ text "Para 1.1", para $ text "Para 1.2"] ,[para $ text "Para 2.1", para $ text "Para 2.2"]] - in table caption mempty headers rows + in table caption [(AlignDefault,0.0),(AlignDefault,0.0)] + headers rows =?> unlines [ " header 1 || header 2" , " Para 1.1 | Para 1.2" , " Para 2.1 | Para 2.2" diff --git a/test/docx/table_variable_width.native b/test/docx/table_variable_width.native index 9d3b961df..b85e58d41 100644 --- a/test/docx/table_variable_width.native +++ b/test/docx/table_variable_width.native @@ -5,9 +5,12 @@ ,[Plain [Str "h4"]] ,[Plain [Str "h5"]]] [[[Plain [Str "c11"]] + ,[] + ,[] ,[] ,[]] ,[[] ,[Plain [Str "c22"]] ,[Plain [Str "c23"]] + ,[] ,[]]]] -- cgit v1.2.3