diff --git a/app/logical/user_deletion.rb b/app/logical/user_deletion.rb index 8b6c555a8..a31ce3b50 100644 --- a/app/logical/user_deletion.rb +++ b/app/logical/user_deletion.rb @@ -34,7 +34,7 @@ class UserDeletion rename reset_password async_delete_user - ModAction.log("deleted user ##{user.id}", :user_delete, subject: user, user: deleter) + ModAction.log("deleted user ##{user.id}", :user_delete, subject: user, user: deleter) if user != deleter UserEvent.create_from_request!(user, :user_deletion, request) if request.present? SessionLoader.new(request).logout(user) if user == deleter end diff --git a/test/unit/user_deletion_test.rb b/test/unit/user_deletion_test.rb index 424344452..30e783c9b 100644 --- a/test/unit/user_deletion_test.rb +++ b/test/unit/user_deletion_test.rb @@ -84,13 +84,10 @@ class UserDeletionTest < ActiveSupport::TestCase assert_equal(false, @user.authenticate_password("password")) end - should "generate a modaction" do + should "not generate a modaction" do @deletion.delete! - assert_match(/deleted user ##{@user.id}/, ModAction.last.description) - assert_equal(@user, ModAction.last.subject) - assert_equal("user_delete", ModAction.last.category) - assert_equal(@deletion.deleter, ModAction.last.creator) + assert_equal(0, ModAction.user_delete.count) end should "remove the user's favorites if they have private favorites" do