##// END OF EJS Templates
only ignore undesirable Auto-Submitted headers defined in RFC3834 (#16190)...
Toshi MARUYAMA -
r12931:4b55bb913c48
parent child
Show More
@@ -74,7 +74,7 class MailHandler < ActionMailer::Base
74 cattr_accessor :ignored_emails_headers
74 cattr_accessor :ignored_emails_headers
75 @@ignored_emails_headers = {
75 @@ignored_emails_headers = {
76 'X-Auto-Response-Suppress' => 'oof',
76 'X-Auto-Response-Suppress' => 'oof',
77 'Auto-Submitted' => /^auto-/
77 'Auto-Submitted' => /^auto-(replied|generated)/
78 }
78 }
79
79
80 # Processes incoming emails
80 # Processes incoming emails
@@ -637,8 +637,7 class MailHandlerTest < ActiveSupport::TestCase
637 "X-Auto-Response-Suppress: OOF",
637 "X-Auto-Response-Suppress: OOF",
638 "Auto-Submitted: auto-replied",
638 "Auto-Submitted: auto-replied",
639 "Auto-Submitted: Auto-Replied",
639 "Auto-Submitted: Auto-Replied",
640 "Auto-Submitted: auto-generated",
640 "Auto-Submitted: auto-generated"
641 "Auto-Submitted: auto-forwarded"
642 ].each do |header|
641 ].each do |header|
643 raw = IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
642 raw = IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
644 raw = header + "\n" + raw
643 raw = header + "\n" + raw
@@ -649,6 +648,19 class MailHandlerTest < ActiveSupport::TestCase
649 end
648 end
650 end
649 end
651
650
651 test "should not ignore Auto-Submitted headers not defined in RFC3834" do
652 [
653 "Auto-Submitted: auto-forwarded"
654 ].each do |header|
655 raw = IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
656 raw = header + "\n" + raw
657
658 assert_difference 'Issue.count', 1 do
659 assert_not_nil MailHandler.receive(raw), "email with #{header} header was ignored"
660 end
661 end
662 end
663
652 def test_add_issue_should_send_email_notification
664 def test_add_issue_should_send_email_notification
653 Setting.notified_events = ['issue_added']
665 Setting.notified_events = ['issue_added']
654 ActionMailer::Base.deliveries.clear
666 ActionMailer::Base.deliveries.clear
General Comments 0
You need to be logged in to leave comments. Login now