aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-17 23:44:03 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-17 23:44:03 +0100
commita6dc227167a8a720bd18495268305b15aa08d8f4 (patch)
treeb641b258a5670526947145c27d091f991e482b2e /actionpack/lib/action_controller
parent21dcbb17de86b92df1a67e233fdc457be4fdf2d7 (diff)
downloadrails-a6dc227167a8a720bd18495268305b15aa08d8f4.tar.gz
rails-a6dc227167a8a720bd18495268305b15aa08d8f4.tar.bz2
rails-a6dc227167a8a720bd18495268305b15aa08d8f4.zip
Mark bang instrumentations as something that you shuold not be listening to.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/test_case.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 107f70d3a3..330b950d7c 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -13,7 +13,7 @@ module ActionController
def setup_subscriptions
@partials = Hash.new(0)
@templates = Hash.new(0)
- ActiveSupport::Notifications.subscribe("action_view.slow_render_template") do |name, start, finish, id, payload|
+ ActiveSupport::Notifications.subscribe("action_view.render_template!") do |name, start, finish, id, payload|
path = payload[:virtual_path]
next unless path
partial = path =~ /^.*\/_[^\/]*$/
@@ -28,7 +28,7 @@ module ActionController
end
def teardown_subscriptions
- ActiveSupport::Notifications.unsubscribe("action_view.slow_render_template")
+ ActiveSupport::Notifications.unsubscribe("action_view.render_template!")
end
# Asserts that the request was rendered with the appropriate template file or partials