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.

spec/components/post_destroyer_spec.rb

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

spec/components/validators/post_validator_spec.rb

@@ -31,4 +31,38 @@ describe Validators::PostValidator do
     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