annotate .svn/pristine/0f/0f05e49d9c9481ce6698da320e7a0f815ec9a184.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
rev   line source
Chris@1295 1 # Redmine - project management software
Chris@1295 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
Chris@1295 3 #
Chris@1295 4 # This program is free software; you can redistribute it and/or
Chris@1295 5 # modify it under the terms of the GNU General Public License
Chris@1295 6 # as published by the Free Software Foundation; either version 2
Chris@1295 7 # of the License, or (at your option) any later version.
Chris@1295 8 #
Chris@1295 9 # This program is distributed in the hope that it will be useful,
Chris@1295 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@1295 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Chris@1295 12 # GNU General Public License for more details.
Chris@1295 13 #
Chris@1295 14 # You should have received a copy of the GNU General Public License
Chris@1295 15 # along with this program; if not, write to the Free Software
Chris@1295 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Chris@1295 17
Chris@1295 18 require File.expand_path('../../../../../test_helper', __FILE__)
Chris@1295 19 require 'digest/md5'
Chris@1295 20
Chris@1295 21 class Redmine::WikiFormatting::TextileFormatterTest < ActionView::TestCase
Chris@1295 22
Chris@1295 23 def setup
Chris@1295 24 @formatter = Redmine::WikiFormatting::Textile::Formatter
Chris@1295 25 end
Chris@1295 26
Chris@1295 27 MODIFIERS = {
Chris@1295 28 "*" => 'strong', # bold
Chris@1295 29 "_" => 'em', # italic
Chris@1295 30 "+" => 'ins', # underline
Chris@1295 31 "-" => 'del', # deleted
Chris@1295 32 "^" => 'sup', # superscript
Chris@1295 33 "~" => 'sub' # subscript
Chris@1295 34 }
Chris@1295 35
Chris@1295 36 def test_modifiers
Chris@1295 37 assert_html_output(
Chris@1295 38 '*bold*' => '<strong>bold</strong>',
Chris@1295 39 'before *bold*' => 'before <strong>bold</strong>',
Chris@1295 40 '*bold* after' => '<strong>bold</strong> after',
Chris@1295 41 '*two words*' => '<strong>two words</strong>',
Chris@1295 42 '*two*words*' => '<strong>two*words</strong>',
Chris@1295 43 '*two * words*' => '<strong>two * words</strong>',
Chris@1295 44 '*two* *words*' => '<strong>two</strong> <strong>words</strong>',
Chris@1295 45 '*(two)* *(words)*' => '<strong>(two)</strong> <strong>(words)</strong>',
Chris@1295 46 # with class
Chris@1295 47 '*(foo)two words*' => '<strong class="foo">two words</strong>'
Chris@1295 48 )
Chris@1295 49 end
Chris@1295 50
Chris@1295 51 def test_modifiers_combination
Chris@1295 52 MODIFIERS.each do |m1, tag1|
Chris@1295 53 MODIFIERS.each do |m2, tag2|
Chris@1295 54 next if m1 == m2
Chris@1295 55 text = "#{m2}#{m1}Phrase modifiers#{m1}#{m2}"
Chris@1295 56 html = "<#{tag2}><#{tag1}>Phrase modifiers</#{tag1}></#{tag2}>"
Chris@1295 57 assert_html_output text => html
Chris@1295 58 end
Chris@1295 59 end
Chris@1295 60 end
Chris@1295 61
Chris@1295 62 def test_styles
Chris@1295 63 # single style
Chris@1295 64 assert_html_output({
Chris@1295 65 'p{color:red}. text' => '<p style="color:red;">text</p>',
Chris@1295 66 'p{color:red;}. text' => '<p style="color:red;">text</p>',
Chris@1295 67 'p{color: red}. text' => '<p style="color: red;">text</p>',
Chris@1295 68 'p{color:#f00}. text' => '<p style="color:#f00;">text</p>',
Chris@1295 69 'p{color:#ff0000}. text' => '<p style="color:#ff0000;">text</p>',
Chris@1295 70 'p{border:10px}. text' => '<p style="border:10px;">text</p>',
Chris@1295 71 'p{border:10}. text' => '<p style="border:10;">text</p>',
Chris@1295 72 'p{border:10%}. text' => '<p style="border:10%;">text</p>',
Chris@1295 73 'p{border:10em}. text' => '<p style="border:10em;">text</p>',
Chris@1295 74 'p{border:1.5em}. text' => '<p style="border:1.5em;">text</p>',
Chris@1295 75 'p{border-left:1px}. text' => '<p style="border-left:1px;">text</p>',
Chris@1295 76 'p{border-right:1px}. text' => '<p style="border-right:1px;">text</p>',
Chris@1295 77 'p{border-top:1px}. text' => '<p style="border-top:1px;">text</p>',
Chris@1295 78 'p{border-bottom:1px}. text' => '<p style="border-bottom:1px;">text</p>',
Chris@1295 79 }, false)
Chris@1295 80
Chris@1295 81 # multiple styles
Chris@1295 82 assert_html_output({
Chris@1295 83 'p{color:red; border-top:1px}. text' => '<p style="color:red;border-top:1px;">text</p>',
Chris@1295 84 'p{color:red ; border-top:1px}. text' => '<p style="color:red;border-top:1px;">text</p>',
Chris@1295 85 'p{color:red;border-top:1px}. text' => '<p style="color:red;border-top:1px;">text</p>',
Chris@1295 86 }, false)
Chris@1295 87
Chris@1295 88 # styles with multiple values
Chris@1295 89 assert_html_output({
Chris@1295 90 'p{border:1px solid red;}. text' => '<p style="border:1px solid red;">text</p>',
Chris@1295 91 'p{border-top-left-radius: 10px 5px;}. text' => '<p style="border-top-left-radius: 10px 5px;">text</p>',
Chris@1295 92 }, false)
Chris@1295 93 end
Chris@1295 94
Chris@1295 95 def test_invalid_styles_should_be_filtered
Chris@1295 96 assert_html_output({
Chris@1295 97 'p{invalid}. text' => '<p>text</p>',
Chris@1295 98 'p{invalid:red}. text' => '<p>text</p>',
Chris@1295 99 'p{color:(red)}. text' => '<p>text</p>',
Chris@1295 100 'p{color:red;invalid:blue}. text' => '<p style="color:red;">text</p>',
Chris@1295 101 'p{invalid:blue;color:red}. text' => '<p style="color:red;">text</p>',
Chris@1295 102 'p{color:"}. text' => '<p>p{color:"}. text</p>',
Chris@1295 103 }, false)
Chris@1295 104 end
Chris@1295 105
Chris@1295 106 def test_inline_code
Chris@1295 107 assert_html_output(
Chris@1295 108 'this is @some code@' => 'this is <code>some code</code>',
Chris@1295 109 '@<Location /redmine>@' => '<code>&lt;Location /redmine&gt;</code>'
Chris@1295 110 )
Chris@1295 111 end
Chris@1295 112
Chris@1295 113 def test_nested_lists
Chris@1295 114 raw = <<-RAW
Chris@1295 115 # Item 1
Chris@1295 116 # Item 2
Chris@1295 117 ** Item 2a
Chris@1295 118 ** Item 2b
Chris@1295 119 # Item 3
Chris@1295 120 ** Item 3a
Chris@1295 121 RAW
Chris@1295 122
Chris@1295 123 expected = <<-EXPECTED
Chris@1295 124 <ol>
Chris@1295 125 <li>Item 1</li>
Chris@1295 126 <li>Item 2
Chris@1295 127 <ul>
Chris@1295 128 <li>Item 2a</li>
Chris@1295 129 <li>Item 2b</li>
Chris@1295 130 </ul>
Chris@1295 131 </li>
Chris@1295 132 <li>Item 3
Chris@1295 133 <ul>
Chris@1295 134 <li>Item 3a</li>
Chris@1295 135 </ul>
Chris@1295 136 </li>
Chris@1295 137 </ol>
Chris@1295 138 EXPECTED
Chris@1295 139
Chris@1295 140 assert_equal expected.gsub(%r{\s+}, ''), to_html(raw).gsub(%r{\s+}, '')
Chris@1295 141 end
Chris@1295 142
Chris@1295 143 def test_escaping
Chris@1295 144 assert_html_output(
Chris@1295 145 'this is a <script>' => 'this is a &lt;script&gt;'
Chris@1295 146 )
Chris@1295 147 end
Chris@1295 148
Chris@1295 149 def test_use_of_backslashes_followed_by_numbers_in_headers
Chris@1295 150 assert_html_output({
Chris@1295 151 'h1. 2009\02\09' => '<h1>2009\02\09</h1>'
Chris@1295 152 }, false)
Chris@1295 153 end
Chris@1295 154
Chris@1295 155 def test_double_dashes_should_not_strikethrough
Chris@1295 156 assert_html_output(
Chris@1295 157 'double -- dashes -- test' => 'double -- dashes -- test',
Chris@1295 158 'double -- *dashes* -- test' => 'double -- <strong>dashes</strong> -- test'
Chris@1295 159 )
Chris@1295 160 end
Chris@1295 161
Chris@1295 162 def test_acronyms
Chris@1295 163 assert_html_output(
Chris@1295 164 'this is an acronym: GPL(General Public License)' => 'this is an acronym: <acronym title="General Public License">GPL</acronym>',
Chris@1295 165 '2 letters JP(Jean-Philippe) acronym' => '2 letters <acronym title="Jean-Philippe">JP</acronym> acronym',
Chris@1295 166 'GPL(This is a double-quoted "title")' => '<acronym title="This is a double-quoted &quot;title&quot;">GPL</acronym>'
Chris@1295 167 )
Chris@1295 168 end
Chris@1295 169
Chris@1295 170 def test_blockquote
Chris@1295 171 # orig raw text
Chris@1295 172 raw = <<-RAW
Chris@1295 173 John said:
Chris@1295 174 > Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
Chris@1295 175 > Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
Chris@1295 176 > * Donec odio lorem,
Chris@1295 177 > * sagittis ac,
Chris@1295 178 > * malesuada in,
Chris@1295 179 > * adipiscing eu, dolor.
Chris@1295 180 >
Chris@1295 181 > >Nulla varius pulvinar diam. Proin id arcu id lorem scelerisque condimentum. Proin vehicula turpis vitae lacus.
Chris@1295 182 > Proin a tellus. Nam vel neque.
Chris@1295 183
Chris@1295 184 He's right.
Chris@1295 185 RAW
Chris@1295 186
Chris@1295 187 # expected html
Chris@1295 188 expected = <<-EXPECTED
Chris@1295 189 <p>John said:</p>
Chris@1295 190 <blockquote>
Chris@1295 191 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.<br />
Chris@1295 192 Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
Chris@1295 193 <ul>
Chris@1295 194 <li>Donec odio lorem,</li>
Chris@1295 195 <li>sagittis ac,</li>
Chris@1295 196 <li>malesuada in,</li>
Chris@1295 197 <li>adipiscing eu, dolor.</li>
Chris@1295 198 </ul>
Chris@1295 199 <blockquote>
Chris@1295 200 <p>Nulla varius pulvinar diam. Proin id arcu id lorem scelerisque condimentum. Proin vehicula turpis vitae lacus.</p>
Chris@1295 201 </blockquote>
Chris@1295 202 <p>Proin a tellus. Nam vel neque.</p>
Chris@1295 203 </blockquote>
Chris@1295 204 <p>He's right.</p>
Chris@1295 205 EXPECTED
Chris@1295 206
Chris@1295 207 assert_equal expected.gsub(%r{\s+}, ''), to_html(raw).gsub(%r{\s+}, '')
Chris@1295 208 end
Chris@1295 209
Chris@1295 210 def test_table
Chris@1295 211 raw = <<-RAW
Chris@1295 212 This is a table with empty cells:
Chris@1295 213
Chris@1295 214 |cell11|cell12||
Chris@1295 215 |cell21||cell23|
Chris@1295 216 |cell31|cell32|cell33|
Chris@1295 217 RAW
Chris@1295 218
Chris@1295 219 expected = <<-EXPECTED
Chris@1295 220 <p>This is a table with empty cells:</p>
Chris@1295 221
Chris@1295 222 <table>
Chris@1295 223 <tr><td>cell11</td><td>cell12</td><td></td></tr>
Chris@1295 224 <tr><td>cell21</td><td></td><td>cell23</td></tr>
Chris@1295 225 <tr><td>cell31</td><td>cell32</td><td>cell33</td></tr>
Chris@1295 226 </table>
Chris@1295 227 EXPECTED
Chris@1295 228
Chris@1295 229 assert_equal expected.gsub(%r{\s+}, ''), to_html(raw).gsub(%r{\s+}, '')
Chris@1295 230 end
Chris@1295 231
Chris@1295 232 def test_table_with_line_breaks
Chris@1295 233 raw = <<-RAW
Chris@1295 234 This is a table with line breaks:
Chris@1295 235
Chris@1295 236 |cell11
Chris@1295 237 continued|cell12||
Chris@1295 238 |-cell21-||cell23
Chris@1295 239 cell23 line2
Chris@1295 240 cell23 *line3*|
Chris@1295 241 |cell31|cell32
Chris@1295 242 cell32 line2|cell33|
Chris@1295 243
Chris@1295 244 RAW
Chris@1295 245
Chris@1295 246 expected = <<-EXPECTED
Chris@1295 247 <p>This is a table with line breaks:</p>
Chris@1295 248
Chris@1295 249 <table>
Chris@1295 250 <tr>
Chris@1295 251 <td>cell11<br />continued</td>
Chris@1295 252 <td>cell12</td>
Chris@1295 253 <td></td>
Chris@1295 254 </tr>
Chris@1295 255 <tr>
Chris@1295 256 <td><del>cell21</del></td>
Chris@1295 257 <td></td>
Chris@1295 258 <td>cell23<br/>cell23 line2<br/>cell23 <strong>line3</strong></td>
Chris@1295 259 </tr>
Chris@1295 260 <tr>
Chris@1295 261 <td>cell31</td>
Chris@1295 262 <td>cell32<br/>cell32 line2</td>
Chris@1295 263 <td>cell33</td>
Chris@1295 264 </tr>
Chris@1295 265 </table>
Chris@1295 266 EXPECTED
Chris@1295 267
Chris@1295 268 assert_equal expected.gsub(%r{\s+}, ''), to_html(raw).gsub(%r{\s+}, '')
Chris@1295 269 end
Chris@1295 270
Chris@1295 271 def test_textile_should_not_mangle_brackets
Chris@1295 272 assert_equal '<p>[msg1][msg2]</p>', to_html('[msg1][msg2]')
Chris@1295 273 end
Chris@1295 274
Chris@1295 275 def test_textile_should_escape_image_urls
Chris@1295 276 # this is onclick="alert('XSS');" in encoded form
Chris@1295 277 raw = '!/images/comment.png"onclick=&#x61;&#x6c;&#x65;&#x72;&#x74;&#x28;&#x27;&#x58;&#x53;&#x53;&#x27;&#x29;;&#x22;!'
Chris@1295 278 expected = '<p><img src="/images/comment.png&quot;onclick=&amp;#x61;&amp;#x6c;&amp;#x65;&amp;#x72;&amp;#x74;&amp;#x28;&amp;#x27;&amp;#x58;&amp;#x53;&amp;#x53;&amp;#x27;&amp;#x29;;&amp;#x22;" alt="" /></p>'
Chris@1295 279 assert_equal expected.gsub(%r{\s+}, ''), to_html(raw).gsub(%r{\s+}, '')
Chris@1295 280 end
Chris@1295 281
Chris@1295 282
Chris@1295 283 STR_WITHOUT_PRE = [
Chris@1295 284 # 0
Chris@1295 285 "h1. Title
Chris@1295 286
Chris@1295 287 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.",
Chris@1295 288 # 1
Chris@1295 289 "h2. Heading 2
Chris@1295 290
Chris@1295 291 Maecenas sed elit sit amet mi accumsan vestibulum non nec velit. Proin porta tincidunt lorem, consequat rhoncus dolor fermentum in.
Chris@1295 292
Chris@1295 293 Cras ipsum felis, ultrices at porttitor vel, faucibus eu nunc.",
Chris@1295 294 # 2
Chris@1295 295 "h2. Heading 2
Chris@1295 296
Chris@1295 297 Morbi facilisis accumsan orci non pharetra.
Chris@1295 298
Chris@1295 299 h3. Heading 3
Chris@1295 300
Chris@1295 301 Nulla nunc nisi, egestas in ornare vel, posuere ac libero.",
Chris@1295 302 # 3
Chris@1295 303 "h3. Heading 3
Chris@1295 304
Chris@1295 305 Praesent eget turpis nibh, a lacinia nulla.",
Chris@1295 306 # 4
Chris@1295 307 "h2. Heading 2
Chris@1295 308
Chris@1295 309 Ut rhoncus elementum adipiscing."]
Chris@1295 310
Chris@1295 311 TEXT_WITHOUT_PRE = STR_WITHOUT_PRE.join("\n\n").freeze
Chris@1295 312
Chris@1295 313 def test_get_section_should_return_the_requested_section_and_its_hash
Chris@1295 314 assert_section_with_hash STR_WITHOUT_PRE[1], TEXT_WITHOUT_PRE, 2
Chris@1295 315 assert_section_with_hash STR_WITHOUT_PRE[2..3].join("\n\n"), TEXT_WITHOUT_PRE, 3
Chris@1295 316 assert_section_with_hash STR_WITHOUT_PRE[3], TEXT_WITHOUT_PRE, 5
Chris@1295 317 assert_section_with_hash STR_WITHOUT_PRE[4], TEXT_WITHOUT_PRE, 6
Chris@1295 318
Chris@1295 319 assert_section_with_hash '', TEXT_WITHOUT_PRE, 0
Chris@1295 320 assert_section_with_hash '', TEXT_WITHOUT_PRE, 10
Chris@1295 321 end
Chris@1295 322
Chris@1295 323 def test_update_section_should_update_the_requested_section
Chris@1295 324 replacement = "New text"
Chris@1295 325
Chris@1295 326 assert_equal [STR_WITHOUT_PRE[0], replacement, STR_WITHOUT_PRE[2..4]].flatten.join("\n\n"), @formatter.new(TEXT_WITHOUT_PRE).update_section(2, replacement)
Chris@1295 327 assert_equal [STR_WITHOUT_PRE[0..1], replacement, STR_WITHOUT_PRE[4]].flatten.join("\n\n"), @formatter.new(TEXT_WITHOUT_PRE).update_section(3, replacement)
Chris@1295 328 assert_equal [STR_WITHOUT_PRE[0..2], replacement, STR_WITHOUT_PRE[4]].flatten.join("\n\n"), @formatter.new(TEXT_WITHOUT_PRE).update_section(5, replacement)
Chris@1295 329 assert_equal [STR_WITHOUT_PRE[0..3], replacement].flatten.join("\n\n"), @formatter.new(TEXT_WITHOUT_PRE).update_section(6, replacement)
Chris@1295 330
Chris@1295 331 assert_equal TEXT_WITHOUT_PRE, @formatter.new(TEXT_WITHOUT_PRE).update_section(0, replacement)
Chris@1295 332 assert_equal TEXT_WITHOUT_PRE, @formatter.new(TEXT_WITHOUT_PRE).update_section(10, replacement)
Chris@1295 333 end
Chris@1295 334
Chris@1295 335 def test_update_section_with_hash_should_update_the_requested_section
Chris@1295 336 replacement = "New text"
Chris@1295 337
Chris@1295 338 assert_equal [STR_WITHOUT_PRE[0], replacement, STR_WITHOUT_PRE[2..4]].flatten.join("\n\n"),
Chris@1295 339 @formatter.new(TEXT_WITHOUT_PRE).update_section(2, replacement, Digest::MD5.hexdigest(STR_WITHOUT_PRE[1]))
Chris@1295 340 end
Chris@1295 341
Chris@1295 342 def test_update_section_with_wrong_hash_should_raise_an_error
Chris@1295 343 assert_raise Redmine::WikiFormatting::StaleSectionError do
Chris@1295 344 @formatter.new(TEXT_WITHOUT_PRE).update_section(2, "New text", Digest::MD5.hexdigest("Old text"))
Chris@1295 345 end
Chris@1295 346 end
Chris@1295 347
Chris@1295 348 STR_WITH_PRE = [
Chris@1295 349 # 0
Chris@1295 350 "h1. Title
Chris@1295 351
Chris@1295 352 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.",
Chris@1295 353 # 1
Chris@1295 354 "h2. Heading 2
Chris@1295 355
Chris@1295 356 <pre><code class=\"ruby\">
Chris@1295 357 def foo
Chris@1295 358 end
Chris@1295 359 </code></pre>
Chris@1295 360
Chris@1295 361 <pre><code><pre><code class=\"ruby\">
Chris@1295 362 Place your code here.
Chris@1295 363 </code></pre>
Chris@1295 364 </code></pre>
Chris@1295 365
Chris@1295 366 Morbi facilisis accumsan orci non pharetra.
Chris@1295 367
Chris@1295 368 <pre>
Chris@1295 369 Pre Content:
Chris@1295 370
Chris@1295 371 h2. Inside pre
Chris@1295 372
Chris@1295 373 <tag> inside pre block
Chris@1295 374
Chris@1295 375 Morbi facilisis accumsan orci non pharetra.
Chris@1295 376 </pre>",
Chris@1295 377 # 2
Chris@1295 378 "h3. Heading 3
Chris@1295 379
Chris@1295 380 Nulla nunc nisi, egestas in ornare vel, posuere ac libero."]
Chris@1295 381
Chris@1295 382 def test_get_section_should_ignore_pre_content
Chris@1295 383 text = STR_WITH_PRE.join("\n\n")
Chris@1295 384
Chris@1295 385 assert_section_with_hash STR_WITH_PRE[1..2].join("\n\n"), text, 2
Chris@1295 386 assert_section_with_hash STR_WITH_PRE[2], text, 3
Chris@1295 387 end
Chris@1295 388
Chris@1295 389 def test_update_section_should_not_escape_pre_content_outside_section
Chris@1295 390 text = STR_WITH_PRE.join("\n\n")
Chris@1295 391 replacement = "New text"
Chris@1295 392
Chris@1295 393 assert_equal [STR_WITH_PRE[0..1], "New text"].flatten.join("\n\n"),
Chris@1295 394 @formatter.new(text).update_section(3, replacement)
Chris@1295 395 end
Chris@1295 396
Chris@1295 397 def test_get_section_should_support_lines_with_spaces_before_heading
Chris@1295 398 # the lines after Content 2 and Heading 4 contain a space
Chris@1295 399 text = <<-STR
Chris@1295 400 h1. Heading 1
Chris@1295 401
Chris@1295 402 Content 1
Chris@1295 403
Chris@1295 404 h1. Heading 2
Chris@1295 405
Chris@1295 406 Content 2
Chris@1295 407
Chris@1295 408 h1. Heading 3
Chris@1295 409
Chris@1295 410 Content 3
Chris@1295 411
Chris@1295 412 h1. Heading 4
Chris@1295 413
Chris@1295 414 Content 4
Chris@1295 415 STR
Chris@1295 416
Chris@1295 417 [1, 2, 3, 4].each do |index|
Chris@1295 418 assert_match /\Ah1. Heading #{index}.+Content #{index}/m, @formatter.new(text).get_section(index).first
Chris@1295 419 end
Chris@1295 420 end
Chris@1295 421
Chris@1295 422 def test_get_section_should_support_headings_starting_with_a_tab
Chris@1295 423 text = <<-STR
Chris@1295 424 h1.\tHeading 1
Chris@1295 425
Chris@1295 426 Content 1
Chris@1295 427
Chris@1295 428 h1. Heading 2
Chris@1295 429
Chris@1295 430 Content 2
Chris@1295 431 STR
Chris@1295 432
Chris@1295 433 assert_match /\Ah1.\tHeading 1\s+Content 1\z/, @formatter.new(text).get_section(1).first
Chris@1295 434 end
Chris@1295 435
Chris@1295 436 private
Chris@1295 437
Chris@1295 438 def assert_html_output(to_test, expect_paragraph = true)
Chris@1295 439 to_test.each do |text, expected|
Chris@1295 440 assert_equal(( expect_paragraph ? "<p>#{expected}</p>" : expected ), @formatter.new(text).to_html, "Formatting the following text failed:\n===\n#{text}\n===\n")
Chris@1295 441 end
Chris@1295 442 end
Chris@1295 443
Chris@1295 444 def to_html(text)
Chris@1295 445 @formatter.new(text).to_html
Chris@1295 446 end
Chris@1295 447
Chris@1295 448 def assert_section_with_hash(expected, text, index)
Chris@1295 449 result = @formatter.new(text).get_section(index)
Chris@1295 450
Chris@1295 451 assert_kind_of Array, result
Chris@1295 452 assert_equal 2, result.size
Chris@1295 453 assert_equal expected, result.first, "section content did not match"
Chris@1295 454 assert_equal Digest::MD5.hexdigest(expected), result.last, "section hash did not match"
Chris@1295 455 end
Chris@1295 456 end