Merge branch 'master' of http://github.com/rails/rails

1 files changed, 16 insertions, 0 deletions

diff --git a/actionmailer/test/mailers/proc_mailer.rb b/actionmailer/test/mailers/proc_mailer.rb
new file mode 100644
index 0000000000..6a79cd71fc
--- /dev/null
+++ b/actionmailer/test/mailers/proc_mailer.rb
@@ -0,0 +1,16 @@
+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 }
+
+  def welcome
+    mail
+  end
+  
+  private
+  
+  def give_a_greeting
+    "Thanks for signing up this afternoon"
+  end
+  
+end