diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-02-19 21:20:15 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-02-19 21:20:15 +0100 |
| commit | d8f1ee4b41352b870f617b01099b2877f754d32c (patch) | |
| tree | dd6bdf1d1ded6aab7bb926109a24e942fc740b73 /actionmailer | |
| parent | 8ba1fc18e13c03966d411947180022c1730e81ff (diff) | |
| parent | 7c0e008973e594ebf53607362c1dfbe34b693600 (diff) | |
| download | rails-d8f1ee4b41352b870f617b01099b2877f754d32c.tar.gz rails-d8f1ee4b41352b870f617b01099b2877f754d32c.tar.bz2 rails-d8f1ee4b41352b870f617b01099b2877f754d32c.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 1 | ||||
| -rw-r--r-- | actionmailer/test/mail_service_test.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 51b375fef3..3e7725570f 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -19,6 +19,7 @@ ActionView::Template.register_template_handler :bak, lambda { |template| "Lame b $:.unshift "#{File.dirname(__FILE__)}/fixtures/helpers" +ActionView::Base.cache_template_loading = true FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures') ActionMailer::Base.template_root = FIXTURE_LOAD_PATH diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index 1e04531753..0934d3537f 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -975,7 +975,7 @@ end class InheritableTemplateRootTest < Test::Unit::TestCase def test_attr - expected = "#{File.dirname(__FILE__)}/fixtures/path.with.dots" + expected = ("#{File.dirname(__FILE__)}/fixtures/path.with.dots").sub(/\.\//, '') assert_equal expected, FunkyPathMailer.template_root.to_s sub = Class.new(FunkyPathMailer) |