aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-06-12 14:06:59 +0200
committerYves Senn <yves.senn@gmail.com>2014-06-12 14:06:59 +0200
commit8f247871bb18b2e3036a05df5f62cbfe3b402586 (patch)
tree1e4c8b4b9ccd82f4effe1949b5c116254223e91a /actionmailer
parent2a7580e63cdcc9cf1c8837578b1d18602db2b74c (diff)
parenta1dbb4e7e0a580e013423c7adf8ba3127c4c59e0 (diff)
downloadrails-8f247871bb18b2e3036a05df5f62cbfe3b402586.tar.gz
rails-8f247871bb18b2e3036a05df5f62cbfe3b402586.tar.bz2
rails-8f247871bb18b2e3036a05df5f62cbfe3b402586.zip
Merge pull request #15590 from zuhao/refactor_actionview_register_template_handler
Add unregister_template_handler to prevent leaks. Conflicts: actionview/CHANGELOG.md
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/abstract_unit.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 93d16f491d..4e5a9c3715 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -23,10 +23,6 @@ ActiveSupport::Deprecation.debug = true
# Disable available locale checks to avoid warnings running the test suite.
I18n.enforce_available_locales = false
-# Bogus template processors
-ActionView::Template.register_template_handler :haml, lambda { |template| "Look its HAML!".inspect }
-ActionView::Template.register_template_handler :bak, lambda { |template| "Lame backup".inspect }
-
FIXTURE_LOAD_PATH = File.expand_path('fixtures', File.dirname(__FILE__))
ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH