aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorthedarkone <nobody>2009-02-12 19:35:14 +0100
committerJoshua Peek <josh@joshpeek.com>2009-02-12 13:04:12 -0600
commit3942cb406e1d5db0ac00e03153809cc8dc4cc4db (patch)
tree3fda08b1509e81f209d5353180feec2086139a3f /actionmailer/test
parentb1d41bdfb06cb5f606f515965316a348d9bc9b47 (diff)
downloadrails-3942cb406e1d5db0ac00e03153809cc8dc4cc4db.tar.gz
rails-3942cb406e1d5db0ac00e03153809cc8dc4cc4db.tar.bz2
rails-3942cb406e1d5db0ac00e03153809cc8dc4cc4db.zip
Port fast reloadable templates from rails-dev-boost.
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/abstract_unit.rb1
-rw-r--r--actionmailer/test/mail_service_test.rb2
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)