Merge pull request #11559 from bughit/11533_to_proc

don't convert mailer default values to procs

2 files changed, 6 insertions, 1 deletions

diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index b9c56c540d..b74728ae34 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -578,6 +578,10 @@ class BaseTest < ActiveSupport::TestCase
     assert(mail1.to_s.to_i > mail2.to_s.to_i)
   end
 
+  test 'default values which have to_proc (e.g. symbols) should not be considered procs' do
+    assert(ProcMailer.welcome['x-has-to-proc'].to_s == 'symbol')
+  end
+
   test "we can call other defined methods on the class as needed" do
     mail = ProcMailer.welcome
     assert_equal("Thanks for signing up this afternoon", mail.subject)
diff --git a/actionmailer/test/mailers/proc_mailer.rb b/actionmailer/test/mailers/proc_mailer.rb
index 733633b575..7e189d861f 100644
--- a/actionmailer/test/mailers/proc_mailer.rb
+++ b/actionmailer/test/mailers/proc_mailer.rb
@@ -1,7 +1,8 @@
 class ProcMailer < ActionMailer::Base
   default to: 'system@test.lindsaar.net',
           'X-Proc-Method' => Proc.new { Time.now.to_i.to_s },
-          subject: Proc.new { give_a_greeting }
+          subject: Proc.new { give_a_greeting },
+          'x-has-to-proc' => :symbol
 
   def welcome
     mail