jro_apps/redmine Commit - r11980:176ce785740c

Fixed that the mail method should return a Mail::Message (#15113)....

Jean-Philippe Lang -

r11980:176ce785740c

parent child

Context file:

r11980:176ce785740c

app/models/mailer.rb +10 -5

                 ActionMailer::Base.delivery_method = saved_method
               end
-              def mail(headers={})
+              def mail(headers={}, &block)
                 headers.merge! 'X-Mailer' => 'Redmine',
                         'X-Redmine-Host' => Setting.host_name,
                         'X-Redmine-Site' => Setting.app_title,
                   headers[:references] = @references_objects.collect {|o| "<#{self.class.references_for(o)}>"}.join(' ')
                 end
-                super headers do |format|
+                m = if block_given?
-                  format.text
+                  super headers, &block
-                  format.html unless Setting.plain_text_mail?
+                else
+                  super headers do |format|
+                    format.text
+                    format.html unless Setting.plain_text_mail?
+                  end
                 end
                 set_language_if_valid @initial_language
+                m
               end
               def initialize(*args)

test/unit/mailer_test.rb +4 0

                 end
               end
+              def test_mail_should_return_a_mail_message
+                assert_kind_of ::Mail::Message, Mailer.test_email(User.find(1))
+              end
               private
               def last_email

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages