diff options
| author | José Valim <jose.valim@gmail.com> | 2010-02-01 23:34:23 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-01 23:34:47 +0100 |
| commit | d74b5e440c04a1d89ae092cab7cb4d93d850f94a (patch) | |
| tree | db087d683e4350323afa0ce20be28fa770076502 /actionmailer/test | |
| parent | ff7a6a9b41937e8bc8e3259af09afe520a19c03e (diff) | |
| download | rails-d74b5e440c04a1d89ae092cab7cb4d93d850f94a.tar.gz rails-d74b5e440c04a1d89ae092cab7cb4d93d850f94a.tar.bz2 rails-d74b5e440c04a1d89ae092cab7cb4d93d850f94a.zip | |
Make AM test suite green.
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 1 | ||||
| -rw-r--r-- | actionmailer/test/base_test.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 8fb941f9c9..f6baa4a9e8 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -2,6 +2,7 @@ require File.expand_path('../../../load_paths', __FILE__) require 'test/unit' require 'action_mailer' +require 'action_mailer/test_case' # Show backtraces for deprecated behavior for quicker cleanup. ActiveSupport::Deprecation.debug = true diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 20ecfdcbdb..7e794e10e8 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -81,8 +81,8 @@ class BaseTest < ActiveSupport::TestCase def different_template(template_name='') mail do |format| - format.text { render :template => template_name } - format.html { render :template => template_name } + format.text { render :template => "#{mailer_name}/#{template_name}" } + format.html { render :template => "#{mailer_name}/#{template_name}" } end end |