Merged r2655 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2656 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 554261533cefe8dc3ce37431c716e1747f5adb65..20b479a053889cc2d0bbf0afca948ab6dd313597 100644 (file)
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -207,7 +207,9 @@ class Mailer < ActionMailer::Base
     # Common headers
     headers 'X-Mailer' => 'Redmine',
             'X-Redmine-Host' => Setting.host_name,
-            'X-Redmine-Site' => Setting.app_title
+            'X-Redmine-Site' => Setting.app_title,
+            'Precedence' => 'bulk',
+            'Auto-Submitted' => 'auto-generated'
   end
 
   # Appends a Redmine header field (name is prepended with 'X-Redmine-')

diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 1fd43af5d46abc284931ebadae84a73381ee954f..5e728e9d3a20067f826e710dd21396e11ac5ace3 100644 (file)
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -86,6 +86,16 @@ class MailerTest < Test::Unit::TestCase
     # restore it
     ActionController::AbstractRequest.relative_url_root = relative_url_root
   end
+  
+  def test_email_headers
+    ActionMailer::Base.deliveries.clear
+    issue = Issue.find(1)
+    Mailer.deliver_issue_add(issue)
+    mail = ActionMailer::Base.deliveries.last
+    assert_not_nil mail
+    assert_equal 'bulk', mail.header_string('Precedence')
+    assert_equal 'auto-generated', mail.header_string('Auto-Submitted')
+  end
 
   def test_plain_text_mail
     Setting.plain_text_mail = 1