Skip to content

Commit 94b9858

Browse files
authored
Update tests for #1247 (#1248)
1 parent cbbf04d commit 94b9858

6 files changed

+39
-36
lines changed

test/rdoc/support/text_formatter_test_case.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ def test_accept_paragraph_wrap
103103
# Test case that calls <tt>@to.accept_table</tt>
104104

105105
def test_accept_table_align
106-
header = ['AA', 'BB', 'CCCCC']
106+
header = ['AA', 'BB', 'CCCCC', 'DDDDD']
107107
body = [
108-
['', 'bbb', 'c'],
109-
['aaaa', 'b', ''],
110-
['a', '', 'cc']
108+
['', 'bbb', 'c', ''],
109+
['aaaa', 'b', '', 'dd'],
110+
['a', '', 'cc', 'dd']
111111
]
112-
aligns = [nil, :left, :right]
112+
aligns = [nil, :left, :right, :center]
113113
@to.start_accepting
114114
@to.accept_table header, body, aligns
115115

test/rdoc/test_rdoc_markup_to_ansi.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22
require_relative 'helper'
33

4-
class TestRDocMarkupToAnsi < RDoc::Markup::TextFormatterTestCase
4+
class RDocMarkupToAnsiTest < RDoc::Markup::TextFormatterTestCase
55

66
add_visitor_tests
77
add_text_tests
@@ -350,11 +350,11 @@ def list_verbatim
350350

351351
def accept_table_align
352352
expected = "\e[0m" + <<-EXPECTED
353-
AA |BB |CCCCC
354-
----|---|-----
355-
|bbb| c
356-
aaaa|b |
357-
a | | cc
353+
AA |BB |CCCCC|DDDDD
354+
----|---|-----|-----
355+
|bbb| c|
356+
aaaa|b | | dd
357+
a | | cc| dd
358358
EXPECTED
359359
assert_equal expected, @to.end_accepting
360360
end

test/rdoc/test_rdoc_markup_to_bs.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22
require_relative 'helper'
33

4-
class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase
4+
class RDocMarkupToBsTest < RDoc::Markup::TextFormatterTestCase
55

66
add_visitor_tests
77
add_text_tests
@@ -351,11 +351,11 @@ def list_verbatim
351351

352352
def accept_table_align
353353
expected = <<-EXPECTED
354-
AA |BB |CCCCC
355-
----|---|-----
356-
|bbb| c
357-
aaaa|b |
358-
a | | cc
354+
AA |BB |CCCCC|DDDDD
355+
----|---|-----|-----
356+
|bbb| c|
357+
aaaa|b | | dd
358+
a | | cc| dd
359359
EXPECTED
360360
assert_equal expected, @to.end_accepting
361361
end

test/rdoc/test_rdoc_markup_to_html.rb

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22
require_relative 'helper'
33

4-
class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase
4+
class RDocMarkupToHtmlTest < RDoc::Markup::FormatterTestCase
55

66
add_visitor_tests
77

@@ -956,31 +956,34 @@ def util_format text
956956
end
957957

958958
def test_accept_table
959-
header = %w[Col1 Col2 Col3]
959+
header = %w[Col1 Col2 Col3 Col4]
960960
body = [
961-
%w[cell1_1 cell1_2 cell1_3],
962-
%w[cell2_1 cell2_2 cell2_3],
963-
['<script>alert("foo");</script>',],
964-
%w[+code+ _em_ **strong**],
961+
%w[cell1_1 cell1_2 cell1_3 cell1_4],
962+
%w[cell2_1 cell2_2 cell2_3 cell2_4],
963+
['<script>alert("foo");</script>'],
964+
%w[+code+ _em_ **strong** C1],
965965
]
966-
aligns = [:left, :right, nil]
966+
aligns = [:left, :right, nil, :center]
967967
@to.start_accepting
968968
@to.accept_table(header, body, aligns)
969969
res = @to.end_accepting
970970
assert_include(res[%r<<th[^<>]*>Col1</th>>], 'align="left"')
971971
assert_include(res[%r<<th[^<>]*>Col2</th>>], 'align="right"')
972972
assert_not_include(res[%r<<th[^<>]*>Col3</th>>], 'align=')
973+
assert_include(res[%r<<th[^<>]*>Col4</th>>], 'align="center"')
973974
assert_include(res[%r<<td[^<>]*>cell1_1</td>>], 'align="left"')
974975
assert_include(res[%r<<td[^<>]*>cell1_2</td>>], 'align="right"')
975976
assert_not_include(res[%r<<td[^<>]*>cell1_3</td>>], 'align=')
976977
assert_include(res[%r<<td[^<>]*>cell2_1</td>>], 'align="left"')
977978
assert_include(res[%r<<td[^<>]*>cell2_2</td>>], 'align="right"')
978979
assert_not_include(res[%r<<td[^<>]*>cell2_3</td>>], 'align=')
980+
assert_include(res[%r<<td[^<>]*>cell2_4</td>>], 'align="center"')
979981
assert_not_include(res, '<script>')
980982
assert_include(res[%r<<td[^<>]*>.*script.*</td>>], '&lt;script&gt;')
981983
assert_include(res[%r<<td[^<>]*>.*code.*</td>>], '<code>code</code>')
982984
assert_include(res[%r<<td[^<>]*>.*em.*</td>>], '<em>em</em>')
983985
assert_include(res[%r<<td[^<>]*>.*strong.*</td>>], '<strong>strong</strong>')
986+
assert_include(res[%r<<td[^<>]*>C1</td>>], 'C1')
984987
end
985988

986989
def assert_escaped(unexpected, code)

test/rdoc/test_rdoc_markup_to_markdown.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22
require_relative 'helper'
33

4-
class TestRDocMarkupToMarkdown < RDoc::Markup::TextFormatterTestCase
4+
class RDocMarkupToMarkdownTest < RDoc::Markup::TextFormatterTestCase
55

66
add_visitor_tests
77
add_text_tests
@@ -348,11 +348,11 @@ def list_verbatim
348348

349349
def accept_table_align
350350
expected = <<-EXPECTED
351-
AA |BB |CCCCC
352-
----|---|-----
353-
|bbb| c
354-
aaaa|b |
355-
a | | cc
351+
AA |BB |CCCCC|DDDDD
352+
----|---|-----|-----
353+
|bbb| c|
354+
aaaa|b | | dd
355+
a | | cc| dd
356356
EXPECTED
357357
assert_equal expected, @to.end_accepting
358358
end

test/rdoc/test_rdoc_markup_to_rdoc.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22
require_relative 'helper'
33

4-
class TestRDocMarkupToRDoc < RDoc::Markup::TextFormatterTestCase
4+
class RDocMarkupToRDocTest < RDoc::Markup::TextFormatterTestCase
55

66
add_visitor_tests
77
add_text_tests
@@ -348,11 +348,11 @@ def list_verbatim
348348

349349
def accept_table_align
350350
expected = <<-EXPECTED
351-
AA |BB |CCCCC
352-
----|---|-----
353-
|bbb| c
354-
aaaa|b |
355-
a | | cc
351+
AA |BB |CCCCC|DDDDD
352+
----|---|-----|-----
353+
|bbb| c|
354+
aaaa|b | | dd
355+
a | | cc| dd
356356
EXPECTED
357357
assert_equal expected, @to.end_accepting
358358
end

0 commit comments

Comments
 (0)