kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makes the mail handler ignore out-of-office emails (#10607).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9358 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-04-06 13:24:30 +00:00
parent 051794dffc
commit dd1163b58a
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/mail_handler.rb
View File

@ -54,6 +54,13 @@ class MailHandler < ActionMailer::Base
end end
return false return false
end end
# Ignore out-of-office emails
if email.header_string("X-Auto-Response-Suppress") == 'OOF'
if logger && logger.info
logger.info "MailHandler: ignoring out-of-office email"
end
return false
end
@user = User.find_by_mail(sender_email) if sender_email.present? @user = User.find_by_mail(sender_email) if sender_email.present?
if @user && !@user.active? if @user && !@user.active?
if logger && logger.info if logger && logger.info

9
test/unit/mail_handler_test.rb
View File

@ -359,6 +359,15 @@ class MailHandlerTest < ActiveSupport::TestCase
end end
end end
def test_should_ignore_oof_emails
raw = IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
raw = "X-Auto-Response-Suppress: OOF\n" + raw
assert_no_difference 'Issue.count' do
assert_equal false, MailHandler.receive(raw)
end
end
def test_add_issue_should_send_email_notification def test_add_issue_should_send_email_notification
Setting.notified_events = ['issue_added'] Setting.notified_events = ['issue_added']
ActionMailer::Base.deliveries.clear ActionMailer::Base.deliveries.clear