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

diff --git a/app/models/issue_comment.rb b/app/models/issue_comment.rb
index 07647d67946f221564dc7667065ee8f737c99aa0..8d150a02f8b88512fdf47070c162dfaadb2dd4e7 100644 (file)
--- a/app/models/issue_comment.rb
+++ b/app/models/issue_comment.rb
@@ -25,4 +25,8 @@ class IssueComment < ApplicationRecord
   belongs_to :user
 
   validates :body, :presence => true, :characters => true
+
+  def body
+    RichText.new("markdown", self[:body])
+  end
 end

diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index e55bf42578fb5200ccf94040f02113b32fd7599c..390977b655601e54b3710ee93b9b4f7025517014 100644 (file)
--- 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 %></p>
+        <p><%= comment.body.to_html %></p>
       </div>
     </div>
     <hr>

diff --git a/test/factories/issue_comment.rb b/test/factories/issue_comment.rb
new file mode 100644 (file)
index 0000000..5231695
--- /dev/null
+++ b/test/factories/issue_comment.rb
@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :issue_comment do
+    sequence(:body) { |n| "This is issue comment #{n}" }
+
+    issue
+    user
+  end
+end

diff --git a/test/models/issue_comment_test.rb b/test/models/issue_comment_test.rb
index 53ba358895999bb54b3eff1e71a27d6c22a143f9..7a1191ead0052653ebf49bd9da8310dea0e36eb6 100644 (file)
--- a/test/models/issue_comment_test.rb
+++ b/test/models/issue_comment_test.rb
@@ -1,7 +1,14 @@
 require "test_helper"
 
 class IssueCommentTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  test "body must be present" do
+    comment = build(:issue_comment, :body => "")
+    assert_not comment.valid?
+    assert_not_nil comment.errors[:body]
+  end
+
+  test "body" do
+    comment = create(:issue_comment)
+    assert_instance_of(RichText::Markdown, comment.body)
+  end
 end