FIX: recover post by a non-staff user fails because the post is not unique. Uniqueness check shouldn't happen when recovering a deleted post.

This commit is contained in:
Neil Lalonde 2013-09-06 11:50:05 -04:00
parent b0573c5f8f
commit eae7e75611
5 changed files with 57 additions and 21 deletions

View File

@ -35,7 +35,7 @@ class Post < ActiveRecord::Base
validates_with ::Validators::PostValidator validates_with ::Validators::PostValidator
# We can pass several creating options to a post via attributes # We can pass several creating options to a post via attributes
attr_accessor :image_sizes, :quoted_post_numbers, :no_bump, :invalidate_oneboxes, :cooking_options attr_accessor :image_sizes, :quoted_post_numbers, :no_bump, :invalidate_oneboxes, :cooking_options, :skip_unique_check
SHORT_POST_CHARS = 1200 SHORT_POST_CHARS = 1200

View File

@ -114,6 +114,7 @@ class PostDestroyer
def user_recovered def user_recovered
Post.transaction do Post.transaction do
@post.update_column(:user_deleted, false) @post.update_column(:user_deleted, false)
@post.skip_unique_check = true
@post.revise(@user, @post.versions.last.modifications["raw"][0], force_new_version: true) @post.revise(@user, @post.versions.last.modifications["raw"][0], force_new_version: true)
@post.update_flagged_posts_count @post.update_flagged_posts_count
end end

View File

@ -58,6 +58,7 @@ class Validators::PostValidator < ActiveModel::Validator
# Stop us from posting the same thing too quickly # Stop us from posting the same thing too quickly
def unique_post_validator(post) def unique_post_validator(post)
return if SiteSetting.unique_posts_mins == 0 return if SiteSetting.unique_posts_mins == 0
return if post.skip_unique_check
return if post.acting_user.admin? || post.acting_user.moderator? return if post.acting_user.admin? || post.acting_user.moderator?
# If the post is empty, default to the validates_presence_of # If the post is empty, default to the validates_presence_of

View File

@ -94,28 +94,28 @@ describe PostDestroyer do
describe 'basic destroying' do describe 'basic destroying' do
context "as the creator of the post" do it "as the creator of the post, doesn't delete the post" do
before do SiteSetting.stubs(:unique_posts_mins).returns(5)
@orig = post.cooked SiteSetting.stubs(:delete_removed_posts_after).returns(24)
PostDestroyer.new(post.user, post).destroy
post.reload
end
it "doesn't delete the post" do post2 = create_post # Create it here instead of with "let" so unique_posts_mins can do its thing
SiteSetting.stubs(:delete_removed_posts_after).returns(24)
post.deleted_at.should be_blank
post.deleted_by.should be_blank
post.user_deleted.should be_true
post.raw.should == I18n.t('js.post.deleted_by_author', {count: 24})
post.version.should == 2
# lets try to recover @orig = post2.cooked
PostDestroyer.new(post.user, post).recover PostDestroyer.new(post2.user, post2).destroy
post.reload post2.reload
post.version.should == 3
post.user_deleted.should be_false post2.deleted_at.should be_blank
post.cooked.should == @orig post2.deleted_by.should be_blank
end post2.user_deleted.should be_true
post2.raw.should == I18n.t('js.post.deleted_by_author', {count: 24})
post2.version.should == 2
# lets try to recover
PostDestroyer.new(post2.user, post2).recover
post2.reload
post2.version.should == 3
post2.user_deleted.should be_false
post2.cooked.should == @orig
end end
context "as a moderator" do context "as a moderator" do

View File

@ -31,4 +31,38 @@ describe Validators::PostValidator do
end end
end end
describe "unique_post_validator" do
before do
SiteSetting.stubs(:unique_posts_mins).returns(5)
end
context "post is unique" do
before do
$redis.stubs(:exists).with(post.unique_post_key).returns(nil)
end
it "should not add an error" do
validator.unique_post_validator(post)
post.errors.count.should == 0
end
end
context "post is not unique" do
before do
$redis.stubs(:exists).with(post.unique_post_key).returns('1')
end
it "should add an error" do
validator.unique_post_validator(post)
expect(post.errors.count).to be > 0
end
it "should not add an error if post.skip_unique_check is true" do
post.skip_unique_check = true
validator.unique_post_validator(post)
post.errors.count.should == 0
end
end
end
end end