Defect #30099 » 30099.patch
| lib/redmine/wiki_formatting/textile/redcloth3.rb | ||
|---|---|---|
| 288 | 288 |
end |
| 289 | 289 |
end.flatten |
| 290 | 290 | |
| 291 |
# standard clean up |
|
| 292 |
incoming_entities text |
|
| 293 |
clean_white_space text |
|
| 294 | ||
| 295 | 291 |
# start processor |
| 296 | 292 |
@pre_list = [] |
| 297 | 293 |
rip_offtags text |
| 294 | ||
| 295 |
# standard clean up |
|
| 296 |
incoming_entities text |
|
| 297 |
clean_white_space text |
|
| 298 | ||
| 298 | 299 |
no_textile text |
| 299 | 300 |
escape_html_tags text |
| 300 | 301 |
# need to do this before #hard_break and #blocks |
| test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb | ||
|---|---|---|
| 621 | 621 |
assert_equal expected.gsub(%r{[\r\n\t]}, ''), to_html(text).gsub(%r{[\r\n\t]}, '')
|
| 622 | 622 |
end |
| 623 | 623 | |
| 624 |
def test_should_not_clear_white_space_in_pre |
|
| 625 |
text = <<-STR |
|
| 626 |
<pre> |
|
| 627 |
This is some text in pre |
|
| 628 | ||
| 629 | ||
| 630 |
two whitespace line avobe here. |
|
| 631 |
</pre> |
|
| 632 |
STR |
|
| 633 |
assert_equal text.chomp, to_html(text) |
|
| 634 |
end |
|
| 635 | ||
| 624 | 636 |
private |
| 625 | 637 | |
| 626 | 638 |
def assert_html_output(to_test, expect_paragraph = true) |
