1 files changed, 9 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index e453dd11ce..42f6c7f79f 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -131,10 +131,17 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
       'action_dispatch.request.parameters' => {
         'action' => 'show',
         'id' => 'unknown',
-        'controller' => 'featured_tiles'
+        'controller' => 'featured_tile'
       }
     })
     assert_response 500
-    assert_match(/RuntimeError\n    in FeaturedTilesController/, body)
+    assert_match(/RuntimeError\n    in FeaturedTileController/, body)
+  end
+
+  test "sets the HTTP charset parameter" do
+    @app = DevelopmentApp
+
+    get "/", {}, {'action_dispatch.show_exceptions' => true}
+    assert_equal "text/html; charset=utf-8", response.headers["Content-Type"]
   end
 end