From: Tom Hughes <tom@compton.nu>
Date: Thu, 9 Jun 2022 18:20:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3566'
X-Git-Tag: live~2189
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/674f531a18738412f1f88425c876b7fb7d8b3bcd?hp=c2b19fa3e81e563aa3d6af71b6ca00e71feb3602

Merge remote-tracking branch 'upstream/pull/3566'
---

diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index 390977b65..709080f9c 100644
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -9,7 +9,7 @@
           <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
                                       :comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %>
         </p>
-        <p><%= comment.body.to_html %></p>
+        <div class="richtext text-break"><%= comment.body.to_html %></div>
       </div>
     </div>
     <hr>
diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb
index 23b6d556e..c995358d3 100644
--- 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 2a9862ed9..f539dd739 100644
--- 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)