FIX: block all emails associated to a user when destroying their record

This commit is contained in:
Régis Hanol
2017-07-25 17:44:46 +02:00
parent 400a55eca3
commit d67fe4c674
3 changed files with 28 additions and 40 deletions

View File

@@ -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