Wrap issue report rich text in div

diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb
index 23b6d556e4023b49879e271b03d44aeb56500a83..c995358d37aa0ca11472712fadbafdc19301274e 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -9,7 +9,7 @@
                                    :user => link_to(report.user.display_name, user_path(report.user)),
                                    :updated_at => l(report.updated_at.to_datetime, :format => :friendly) %>
       </p>
-      <p class="richtext text-break"><%= report.details.to_html %></p>
+      <div class="richtext text-break"><%= report.details.to_html %></div>
     </div>
   </div>
   <hr>

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 2a9862ed9625e40a3028804e9563ad56fe702ed0..f539dd739052fb844b5fc37d32504fa86a1c8236 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -41,6 +41,23 @@ class IssuesTest < ApplicationSystemTestCase
     assert_selector "strong", :text => "with kramdown"
   end
 
+  def test_view_issue_rich_text_container
+    sign_in_as(create(:moderator_user))
+    issue = create(:issue, :assigned_role => "moderator")
+    issue.reports << create(:report, :details => "paragraph one\n\n---\n\nparagraph two")
+
+    visit issue_path(issue)
+    assert_content I18n.t("issues.show.reports", :count => 1)
+    richtext = find "div.richtext"
+    richtext_elements = richtext.all "*"
+    assert_equal 3, richtext_elements.size
+    assert_equal "p", richtext_elements[0].tag_name
+    assert_equal "paragraph one", richtext_elements[0].text
+    assert_equal "hr", richtext_elements[1].tag_name
+    assert_equal "p", richtext_elements[2].tag_name
+    assert_equal "paragraph two", richtext_elements[2].text
+  end
+
   def test_view_issues_with_no_reported_user
     sign_in_as(create(:moderator_user))
     anonymous_note = create(:note_with_comments)