diff options
| -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  | 
