This commit is contained in:
r888888888
2014-12-12 17:36:48 -08:00
parent ad22e42e62
commit cee524ec48
2 changed files with 10 additions and 2 deletions

View File

@@ -196,11 +196,12 @@ class Dmail < ActiveRecord::Base
def auto_delete_if_filtered
if owner_id != CurrentUser.user.id && to.dmail_filter.try(:filtered?, self)
self.is_deleted = true
self.is_read = true
end
end
def update_recipient
unless is_deleted
unless is_deleted?
to.update_attribute(:has_mail, true)
end
end

View File

@@ -29,7 +29,14 @@ class DmailTest < ActiveSupport::TestCase
should "autodelete if it has a banned word" do
@dmail.save
assert(@dmail.is_deleted)
assert_equal(true, @dmail.is_deleted?)
assert_equal(true, @dmail.is_read?)
end
should "not update the recipient's has_mail if filtered" do
@dmail.save
@recipient.reload
assert_equal(false, @recipient.has_mail?)
end
context "that is empty" do