aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorGenadi Samokovarov <gsamokovarov@gmail.com>2018-12-28 14:21:30 +0200
committerGenadi Samokovarov <gsamokovarov@gmail.com>2019-04-19 14:15:22 +0900
commit54df392bc51dcf424f07ccc10157a5969256ba73 (patch)
tree619682801ff05e6af5475f6ed303001e29ebed55 /actionpack
parent255a2422a3082fc1c194610ab43c08e755d16c9a (diff)
downloadrails-54df392bc51dcf424f07ccc10157a5969256ba73.tar.gz
rails-54df392bc51dcf424f07ccc10157a5969256ba73.tar.bz2
rails-54df392bc51dcf424f07ccc10157a5969256ba73.zip
Manage ActionDispatch::ActionableExceptions from the default middleware stack
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/middleware/debug_exceptions.rb2
-rw-r--r--actionpack/test/abstract_unit.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index a679f9bf01..0b15c94122 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -21,7 +21,7 @@ module ActionDispatch
end
def initialize(app, routes_app = nil, response_format = :default, interceptors = self.class.interceptors)
- @app = ActionableExceptions.new(app)
+ @app = app
@routes_app = routes_app
@response_format = response_format
@interceptors = interceptors
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 6460ca6f8d..32a0b8efeb 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -96,6 +96,7 @@ class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
middleware.use ActionDispatch::ShowExceptions, ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public")
middleware.use ActionDispatch::DebugExceptions
+ middleware.use ActionDispatch::ActionableExceptions
middleware.use ActionDispatch::Callbacks
middleware.use ActionDispatch::Cookies
middleware.use ActionDispatch::Flash