aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-24 19:52:44 +0100
committerJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-24 19:52:50 +0100
commita74a655648618a6ed568b9b4ef3a17a8970e7774 (patch)
tree84c1c255aa7b66c35e4303ea934fcf2e40361c8e /actionmailer/lib
parentbd96614101262e0ad0cc176ed8e2d95a5c17936b (diff)
downloadrails-a74a655648618a6ed568b9b4ef3a17a8970e7774.tar.gz
rails-a74a655648618a6ed568b9b4ef3a17a8970e7774.tar.bz2
rails-a74a655648618a6ed568b9b4ef3a17a8970e7774.zip
Add tests to mail helper.
Diffstat (limited to 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer/base.rb1
-rw-r--r--actionmailer/lib/action_mailer/mail_helper.rb4
2 files changed, 2 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 1b81cbf5af..7101bfbb70 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -256,7 +256,6 @@ module ActionMailer #:nodoc:
include DeliveryMethods, Quoting
abstract!
- # TODO Add some sanity tests for the included modules
include AbstractController::Logger
include AbstractController::Rendering
include AbstractController::LocalizedCache
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
index 01da954b03..ab5c3469b2 100644
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -17,12 +17,12 @@ module ActionMailer
end
# Access the mailer instance.
- def mailer #:nodoc:
+ def mailer
@_controller
end
# Access the message instance.
- def message #:nodoc:
+ def message
@_message
end
end