mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing up tests and docs to use defaults :from => 'name' instead of defaults({:from => 'name'})

This commit is contained in:
Mikel Lindsaar 2010-01-27 00:37:22 +11:00
parent 1133757a95
commit ccea6ab07d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actionmailer/lib/action_mailer/base.rb
View File

@ -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

6
actionmailer/test/base_test.rb
View File

@ -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"