1 files changed, 16 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 2a478c214f..e453dd11ce 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -7,6 +7,8 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     case req.path
     when "/not_found"
       raise ActionController::UnknownAction
+    when "/runtime_error"
+      raise RuntimeError
     when "/method_not_allowed"
       raise ActionController::MethodNotAllowed
     when "/not_implemented"
@@ -121,4 +123,18 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     assert_response 404
     assert_match(/AbstractController::ActionNotFound/, body)
   end
+
+  test "show the controller name in the diagnostics template when controller name is present" do
+    @app = ProductionApp
+    get("/runtime_error", {}, {
+      'action_dispatch.show_exceptions' => true,
+      'action_dispatch.request.parameters' => {
+        'action' => 'show',
+        'id' => 'unknown',
+        'controller' => 'featured_tiles'
+      }
+    })
+    assert_response 500
+    assert_match(/RuntimeError\n    in FeaturedTilesController/, body)
+  end
 end