2 files changed, 3 insertions, 9 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/callbacks.rb b/actionpack/lib/action_dispatch/middleware/callbacks.rb
index 2f86a382c2..56d6da1706 100644
--- a/actionpack/lib/action_dispatch/middleware/callbacks.rb
+++ b/actionpack/lib/action_dispatch/middleware/callbacks.rb
@@ -2,7 +2,7 @@ module ActionDispatch
   class Callbacks
     include ActiveSupport::NewCallbacks
 
-    define_callbacks :call, :terminator => "result == false", :scope => :kind
+    define_callbacks :call, :terminator => "result == false", :rescuable => true
     define_callbacks :prepare, :scope => :name
 
     # Add a preparation callback. Preparation callbacks are run before every
@@ -25,10 +25,6 @@ module ActionDispatch
       set_callback(:call, :before, *args, &block)
     end
 
-    def self.around(*args, &block)
-      set_callback(:call, :around, *args, &block)
-    end
-
     def self.after(*args, &block)
       set_callback(:call, :after, *args, &block)
     end
@@ -36,7 +32,6 @@ module ActionDispatch
     class << self
       # DEPRECATED
       alias_method :before_dispatch, :before
-      alias_method :around_dispatch, :around
       alias_method :after_dispatch, :after
     end
 
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index bd17df73c7..1a9f95e5e9 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -631,9 +631,8 @@ class FragmentCachingTest < ActionController::TestCase
     buffer = 'generated till now -> '
     @controller.fragment_for(buffer, 'expensive') { fragment_computed = true }
 
-    assert_equal 2, listener.size
-    assert_equal :fragment_exist?, listener[0].name
-    assert_equal :write_fragment, listener[1].name
+    assert_equal 1, listener.count { |e| e.name == :fragment_exist? }
+    assert_equal 1, listener.count { |e| e.name == :write_fragment }
 
     assert fragment_computed
     assert_equal 'generated till now -> ', buffer