Merge pull request #1882 from codidact/0valt/more-complaints-suggestions

Author: ArtOfCode-

test/controllers/posts/restore_test.rb

@@ -44,7 +44,22 @@ class PostsControllerTest < ActionController::TestCase
     assert_response(:found)
     assert_redirected_to post_path(assigns(:post))
     assert_not_nil flash[:danger]
-    assert_equal before_history, after_history, 'PostHistory event incorrectly created on deletion'
+    assert_equal before_history, after_history, 'Expected no PostHistory events to be created'
+  end
+
+  test 'no one but staff should be able to restore posts deleted by staff' do
+    deleted_by_staff = posts(:deleted_staff)
+
+    sign_in users(:deleter)
+
+    before_history = PostHistory.where(post: deleted_by_staff).count
+    post :restore, params: { id: deleted_by_staff.id }
+    after_history = PostHistory.where(post: deleted_by_staff).count
+
+    assert_response(:found)
+    assert_redirected_to post_path(assigns(:post))
+    assert_not_nil flash[:danger]
+    assert_equal before_history, after_history, 'Expected no PostHistory events to be created'
   end
 
   test 'cannot restore a restored post' do

test/fixtures/posts.yml

@@ -130,6 +130,26 @@ deleted_mod:
   upvote_count: 0
   downvote_count: 0
 
+deleted_staff:
+  post_type: question
+  title: Q4DS - This question is deleted by a staff member
+  body: Q4DS - This question is in category main, posted by standard_user. It has been deleted by a staff member.
+  body_markdown: Q4DS - This question is in category main, posted by standard_user. It has been deleted by a staff member.
+  tags_cache:
+    - support
+  tags:
+    - support
+  score: 0.5
+  user: standard_user
+  deleted: true
+  deleted_at: 2019-01-01T00:00:00.000000Z
+  deleted_by: staff
+  community: sample
+  category: main
+  license: cc_by_sa
+  upvote_count: 0
+  downvote_count: 0
+
 closed:
   post_type: question
   title: Q4C - This question is closed