annotate .svn/pristine/8e/8e4c7afc7109386dd42e0a86c04a6247a9bd537e.svn-base @ 1519:afce8026aaeb redmine-2.4-integration

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