mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FIX: block all emails associated to a user when destroying their record
This commit is contained in:
@@ -54,10 +54,9 @@ describe UserDestroyer do
|
||||
end
|
||||
|
||||
it "adds email to block list if block_email is true" do
|
||||
b = Fabricate.build(:screened_email, email: @user.email)
|
||||
ScreenedEmail.expects(:block).with(@user.email, has_key(:ip_address)).returns(b)
|
||||
b.expects(:record_match!).once.returns(true)
|
||||
UserDestroyer.new(@admin).destroy(@user, destroy_opts.merge({block_email: true}))
|
||||
expect {
|
||||
UserDestroyer.new(@admin).destroy(@user, destroy_opts.merge(block_email: true))
|
||||
}.to change { ScreenedEmail.count }.by(1)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -228,15 +227,8 @@ describe UserDestroyer do
|
||||
context 'and destroy fails' do
|
||||
subject(:destroy) { UserDestroyer.new(@admin).destroy(@user) }
|
||||
|
||||
before do
|
||||
@user.stubs(:destroy).returns(false)
|
||||
end
|
||||
|
||||
it 'should return false' do
|
||||
expect(destroy).to eq(false)
|
||||
end
|
||||
|
||||
it 'should not log the action' do
|
||||
@user.stubs(:destroy).returns(false)
|
||||
StaffActionLogger.any_instance.expects(:log_user_deletion).never
|
||||
destroy
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user