diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-27 00:37:22 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-27 00:38:12 +1100 |
| commit | ccea6ab07d38c5bc2de341c3f08d199ef55bccc6 (patch) | |
| tree | d04ca9c4176aa11cab5395c8c970fd2c4d7a8479 | |
| parent | 1133757a95f5cee0044cca6f360f5d63df3bb583 (diff) | |
| download | rails-ccea6ab07d38c5bc2de341c3f08d199ef55bccc6.tar.gz rails-ccea6ab07d38c5bc2de341c3f08d199ef55bccc6.tar.bz2 rails-ccea6ab07d38c5bc2de341c3f08d199ef55bccc6.zip | |
Fixing up tests and docs to use defaults :from => 'name' instead of defaults({:from => 'name'})
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 3 | ||||
| -rw-r--r-- | actionmailer/test/base_test.rb | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index f677ab629e..669e49c91c 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -23,7 +23,8 @@ module ActionMailer #:nodoc: # Examples: # # class Notifier < ActionMailer::Base - # defaults({:from => 'system@example.com'}) + # defaults :from => 'no-reply@example.com', + # :return_path => 'system@example.com' # # def welcome(recipient) # @account = recipient diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 6900e77178..0709c92326 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -5,9 +5,9 @@ class BaseTest < ActiveSupport::TestCase class BaseMailer < ActionMailer::Base self.mailer_name = "base_mailer" - defaults({:to => 'system@test.lindsaar.net', - :from => 'jose@test.plataformatec.com', - :reply_to => 'mikel@test.lindsaar.net'}) + defaults :to => 'system@test.lindsaar.net', + :from => 'jose@test.plataformatec.com', + :reply_to => 'mikel@test.lindsaar.net' def welcome(hash = {}) headers['X-SPAM'] = "Not SPAM" |