From 93c9b622a10c88894ddf1544238314eaeb00d299 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 1 May 2017 23:59:18 -0500
Subject: [PATCH] post_approval.rb: log correct post id when approving deleted
 posts.

---
 app/models/post_approval.rb |  2 +-
 test/unit/post_test.rb      | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/models/post_approval.rb b/app/models/post_approval.rb
index 47f476699..e4a219b25 100644
--- a/app/models/post_approval.rb
+++ b/app/models/post_approval.rb
@@ -28,7 +28,7 @@ class PostApproval < ActiveRecord::Base
   end
 
   def approve_post
-    ModAction.log("undeleted post ##{id}") if post.is_deleted
+    ModAction.log("undeleted post ##{post_id}") if post.is_deleted
 
     post.flags.each(&:resolve!)
     post.update({ approver: user, is_flagged: false, is_pending: false, is_deleted: false }, without_protection: true)
diff --git a/test/unit/post_test.rb b/test/unit/post_test.rb
index ceb50527d..d0c502f15 100644
--- a/test/unit/post_test.rb
+++ b/test/unit/post_test.rb
@@ -349,9 +349,8 @@ class PostTest < ActiveSupport::TestCase
         end
 
         should "create a mod action" do
-          assert_difference("ModAction.count", 1) do
-            @post.undelete!
-          end
+          @post.undelete!
+          assert_equal("undeleted post ##{@post.id}", ModAction.last.description)
         end
       end
 
@@ -362,9 +361,8 @@ class PostTest < ActiveSupport::TestCase
         end
 
         should "create a mod action" do
-          assert_difference("ModAction.count", 1) do
-            @post.approve!
-          end
+          @post.approve!
+          assert_equal("undeleted post ##{@post.id}", ModAction.last.description)
         end
       end