Close unclosed pre/code tags (#4265).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3590 e93f8b46-1217-0410-a6f0-8f06a7374b81

Close unclosed pre/code tags (#4265).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3590 e93f8b46-1217-0410-a6f0-8f06a7374b81
6b88de12 · Jean-Philippe Lang · 72031962 · 6b88de12 · 6b88de12
Commit 6b88de12 authored Mar 15, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 0 deletions

application_helper.rb app/helpers/application_helper.rb +4 -0

application_helper_test.rb test/unit/helpers/application_helper_test.rb +14 -0

No files found.
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -439,6 +439,10 @@ module ApplicationHelper
        parsed << full_tag
      end
    end
+    # Close any non closing tags
+    while tag = tags.pop
+      parsed << "</#{tag}>"
+    end
    parsed
  end
  

--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -324,6 +324,20 @@ EXPECTED
    assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
  end
  
+  def test_non_closing_pre_blocks_should_be_closed
+    raw = <<-RAW
+<pre><code>
+RAW
+
+    expected = <<-EXPECTED
+<pre><code>
+</code></pre>
+EXPECTED
+                                 
+    @project = Project.find(1)
+    assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
+  end
+  
  def test_syntax_highlight
    raw = <<-RAW
 <pre><code class="ruby">