1 files changed, 12 insertions, 12 deletions
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index ab1bd0e3b6..ff23b22040 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -5,7 +5,7 @@ module ShowExceptions
     use ActionDispatch::ShowExceptions, ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public")
     use ActionDispatch::DebugExceptions
 
-    before_filter :only => :another_boom do
+    before_action only: :another_boom do
       request.env["action_dispatch.show_detailed_exceptions"] = true
     end
 
@@ -47,7 +47,7 @@ module ShowExceptions
     end
   end
 
-  class ShowExceptionsOverridenController < ShowExceptionsController
+  class ShowExceptionsOverriddenController < ShowExceptionsController
     private
 
     def show_detailed_exceptions?
@@ -55,15 +55,15 @@ module ShowExceptions
     end
   end
 
-  class ShowExceptionsOverridenTest < ActionDispatch::IntegrationTest
+  class ShowExceptionsOverriddenTest < ActionDispatch::IntegrationTest
     test 'show error page' do
-      @app = ShowExceptionsOverridenController.action(:boom)
+      @app = ShowExceptionsOverriddenController.action(:boom)
       get '/', {'detailed' => '0'}
       assert_equal "500 error fixture\n", body
     end
 
     test 'show diagnostics message' do
-      @app = ShowExceptionsOverridenController.action(:boom)
+      @app = ShowExceptionsOverriddenController.action(:boom)
       get '/', {'detailed' => '1'}
       assert_match(/boom/, body)
     end
@@ -71,23 +71,23 @@ module ShowExceptions
 
   class ShowExceptionsFormatsTest < ActionDispatch::IntegrationTest
     def test_render_json_exception
-      @app = ShowExceptionsOverridenController.action(:boom)
+      @app = ShowExceptionsOverriddenController.action(:boom)
       get "/", {}, 'HTTP_ACCEPT' => 'application/json'
       assert_response :internal_server_error
       assert_equal 'application/json', response.content_type.to_s
-      assert_equal({ :status => '500', :error => 'boom!' }.to_json, response.body)
+      assert_equal({ :status => '500', :error => 'Internal Server Error' }.to_json, response.body)
     end
 
     def test_render_xml_exception
-      @app = ShowExceptionsOverridenController.action(:boom)
+      @app = ShowExceptionsOverriddenController.action(:boom)
       get "/", {}, 'HTTP_ACCEPT' => 'application/xml'
       assert_response :internal_server_error
       assert_equal 'application/xml', response.content_type.to_s
-      assert_equal({ :status => '500', :error => 'boom!' }.to_xml, response.body)
+      assert_equal({ :status => '500', :error => 'Internal Server Error' }.to_xml, response.body)
     end
 
     def test_render_fallback_exception
-      @app = ShowExceptionsOverridenController.action(:boom)
+      @app = ShowExceptionsOverriddenController.action(:boom)
       get "/", {}, 'HTTP_ACCEPT' => 'text/csv'
       assert_response :internal_server_error
       assert_equal 'text/html', response.content_type.to_s
@@ -96,7 +96,7 @@ module ShowExceptions
 
   class ShowFailsafeExceptionsTest < ActionDispatch::IntegrationTest
     def test_render_failsafe_exception
-      @app = ShowExceptionsOverridenController.action(:boom)
+      @app = ShowExceptionsOverriddenController.action(:boom)
       @exceptions_app = @app.instance_variable_get(:@exceptions_app)
       @app.instance_variable_set(:@exceptions_app, nil)
       $stderr = StringIO.new
@@ -104,7 +104,7 @@ module ShowExceptions
       get '/', {}, 'HTTP_ACCEPT' => 'text/json'
       assert_response :internal_server_error
       assert_equal 'text/plain', response.content_type.to_s
-
+    ensure
       @app.instance_variable_set(:@exceptions_app, @exceptions_app)
       $stderr = STDERR
     end