Prevent commenting on nonexistent posts (#2704).
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
class Comment < ActiveRecord::Base
|
class Comment < ActiveRecord::Base
|
||||||
include Mentionable
|
include Mentionable
|
||||||
|
|
||||||
|
validate :validate_post_exists, :on => :create
|
||||||
validate :validate_creator_is_not_limited, :on => :create
|
validate :validate_creator_is_not_limited, :on => :create
|
||||||
validates_format_of :body, :with => /\S/, :message => 'has no content'
|
validates_format_of :body, :with => /\S/, :message => 'has no content'
|
||||||
belongs_to :post
|
belongs_to :post
|
||||||
@@ -148,6 +149,10 @@ class Comment < ActiveRecord::Base
|
|||||||
User.id_to_name(updater_id)
|
User.id_to_name(updater_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def validate_post_exists
|
||||||
|
errors.add(:post, "must exist") unless Post.exists?(post_id)
|
||||||
|
end
|
||||||
|
|
||||||
def validate_creator_is_not_limited
|
def validate_creator_is_not_limited
|
||||||
if creator.is_comment_limited? && !do_not_bump_post?
|
if creator.is_comment_limited? && !do_not_bump_post?
|
||||||
errors.add(:base, "You can only post #{Danbooru.config.member_comment_limit} comments per hour")
|
errors.add(:base, "You can only post #{Danbooru.config.member_comment_limit} comments per hour")
|
||||||
|
|||||||
@@ -65,6 +65,11 @@ class CommentsControllerTest < ActionController::TestCase
|
|||||||
comment = Comment.last
|
comment = Comment.last
|
||||||
assert_redirected_to post_path(comment.post)
|
assert_redirected_to post_path(comment.post)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
should "not allow commenting on nonexistent posts" do
|
||||||
|
post :create, {:comment => FactoryGirl.attributes_for(:comment, :post_id => -1)}, {:user_id => @user.id}
|
||||||
|
assert_response :error
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -101,6 +101,13 @@ class CommentTest < ActiveSupport::TestCase
|
|||||||
assert(comment.errors.empty?, comment.errors.full_messages.join(", "))
|
assert(comment.errors.empty?, comment.errors.full_messages.join(", "))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
should "not validate if the post does not exist" do
|
||||||
|
comment = FactoryGirl.build(:comment, :post_id => -1)
|
||||||
|
|
||||||
|
assert_not(comment.valid?)
|
||||||
|
assert_equal(["must exist"], comment.errors[:post])
|
||||||
|
end
|
||||||
|
|
||||||
should "not bump the parent post" do
|
should "not bump the parent post" do
|
||||||
post = FactoryGirl.create(:post)
|
post = FactoryGirl.create(:post)
|
||||||
comment = FactoryGirl.create(:comment, :do_not_bump_post => true, :post => post)
|
comment = FactoryGirl.create(:comment, :do_not_bump_post => true, :post => post)
|
||||||
|
|||||||
Reference in New Issue
Block a user