Skip to content
This repository
Browse code

Fixing up tests and docs to use defaults :from => 'name' instead of d…

…efaults({:from => 'name'})
  • Loading branch information...
commit ccea6ab07d38c5bc2de341c3f08d199ef55bccc6 1 parent 1133757
Mikel Lindsaar authored January 27, 2010
3  actionmailer/lib/action_mailer/base.rb
@@ -23,7 +23,8 @@ module ActionMailer #:nodoc:
23 23
   # Examples:
24 24
   #
25 25
   #  class Notifier < ActionMailer::Base
26  
-  #    defaults({:from => 'system@example.com'})
  26
+  #    defaults :from => 'no-reply@example.com',
  27
+  #             :return_path => 'system@example.com'
27 28
   # 
28 29
   #    def welcome(recipient)
29 30
   #      @account = recipient
6  actionmailer/test/base_test.rb
@@ -5,9 +5,9 @@ class BaseTest < ActiveSupport::TestCase
5 5
   class BaseMailer < ActionMailer::Base
6 6
     self.mailer_name = "base_mailer"
7 7
 
8  
-    defaults({:to => 'system@test.lindsaar.net',
9  
-              :from => 'jose@test.plataformatec.com',
10  
-              :reply_to => 'mikel@test.lindsaar.net'})
  8
+    defaults :to => 'system@test.lindsaar.net',
  9
+             :from => 'jose@test.plataformatec.com',
  10
+             :reply_to => 'mikel@test.lindsaar.net'
11 11
 
12 12
     def welcome(hash = {})
13 13
       headers['X-SPAM'] = "Not SPAM"

0 notes on commit ccea6ab

Please sign in to comment.
Something went wrong with that request. Please try again.