Merge pull request heartcombo#1282 from apocalyptiq/master

Allow to set default 'from' header of Devise mails in custom mailer class

lib/devise/mailers/helpers.rb

@@ -50,7 +50,9 @@ def headers_for(action)
       end
 
       def mailer_sender(mapping)
-        if Devise.mailer_sender.is_a?(Proc)
+        if default_params[:from].present?
+          default_params[:from]
+        elsif Devise.mailer_sender.is_a?(Proc)
           Devise.mailer_sender.call(mapping.name)
         else
           Devise.mailer_sender
@@ -86,4 +88,4 @@ def translate(mapping, key)
       end
     end
   end
-end
+end

lib/generators/templates/devise.rb

@@ -2,7 +2,8 @@
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
   # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in DeviseMailer.
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
   config.mailer_sender = "[email protected]"
 
   # Configure the class responsible to send e-mails.

test/mailers/confirmation_instructions_test.rb

@@ -4,6 +4,7 @@ class ConfirmationInstructionsTest < ActionMailer::TestCase
 
   def setup
     setup_mailer
+    Devise.mailer = 'Devise::Mailer'
     Devise.mailer_sender = '[email protected]'
   end
 
@@ -35,6 +36,11 @@ def mail
     assert_equal ['[email protected]'], mail.from
   end
 
+  test 'setup sender from custom mailer defaults' do
+    Devise.mailer = 'Users::Mailer'
+    assert_equal ['[email protected]'], mail.from
+  end
+
   test 'setup reply to as copy from sender' do
     assert_equal ['[email protected]'], mail.reply_to
   end

test/mailers/reset_password_instructions_test.rb

@@ -4,6 +4,7 @@ class ResetPasswordInstructionsTest < ActionMailer::TestCase
 
   def setup
     setup_mailer
+    Devise.mailer = 'Devise::Mailer'
     Devise.mailer_sender = '[email protected]'
   end
 
@@ -38,6 +39,11 @@ def mail
     assert_equal ['[email protected]'], mail.from
   end
 
+  test 'setup sender from custom mailer defaults' do
+    Devise.mailer = 'Users::Mailer'
+    assert_equal ['[email protected]'], mail.from
+  end
+
   test 'setup reply to as copy from sender' do
     assert_equal ['[email protected]'], mail.reply_to
   end

test/mailers/unlock_instructions_test.rb

@@ -4,6 +4,7 @@ class UnlockInstructionsTest < ActionMailer::TestCase
 
   def setup
     setup_mailer
+    Devise.mailer = 'Devise::Mailer'
     Devise.mailer_sender = '[email protected]'
   end
 
@@ -38,6 +39,11 @@ def mail
     assert_equal ['[email protected]'], mail.from
   end
 
+  test 'setup sender from custom mailer defaults' do
+    Devise.mailer = 'Users::Mailer'
+    assert_equal ['[email protected]'], mail.from
+  end
+
   test 'setup reply to as copy from sender' do
     assert_equal ['[email protected]'], mail.reply_to
   end

test/rails_app/app/mailers/users/mailer.rb

@@ -0,0 +1,3 @@
+class Users::Mailer < Devise::Mailer
+  default :from => '[email protected]'
+end

test/rails_app/config/initializers/devise.rb

@@ -2,7 +2,8 @@
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
   # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in DeviseMailer.
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
   config.mailer_sender = "[email protected]"
 
   # Configure the class responsible to send e-mails.