Merged r1505, r1506, r1511, r1512, r1517, r1518, r1524 to 1526 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1532 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-06-14 12:21:52 +00:00
parent 9c5ec2974d
commit 2af910e8e6
9 changed files with 18 additions and 8 deletions
@@ -151,6 +151,14 @@ class ApplicationHelperTest < HelperTestCase
    to_test.each { |text, result| assert_equal result, textilizable(text) }
  end
  
+  def test_allowed_html_tags
+    to_test = {
+      "<pre>preformatted text</pre>" => "<pre>preformatted text</pre>",
+      "<notextile>no *textile* formatting</notextile>" => "no *textile* formatting",
+    }
+    to_test.each { |text, result| assert_equal result, textilizable(text) }
+  end
+  
  def test_wiki_links_in_tables
    to_test = {"|Cell 11|Cell 12|Cell 13|\n|Cell 21|Cell 22||\n|Cell 31||Cell 33|" => 
                 '<tr><td>Cell 11</td><td>Cell 12</td><td>Cell 13</td></tr>' +