Merge pull request #3888 from kennyj/should_use_default_charset

Assign config.encoding to AD::Response.default_charset at the initialization time.

1 files changed, 6 insertions, 0 deletions

diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 446c85d65a..e6e2c525f5 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -136,6 +136,12 @@ module ApplicationTests
       assert_equal 2, ActionDispatch::Http::URL.tld_length
     end
 
+    test "assignment config.encoding to default_charset" do
+      add_to_config "config.encoding = 'Shift_JIS'"
+      require "#{app_path}/config/environment"
+      assert_equal 'Shift_JIS', ActionDispatch::Response.default_charset
+    end
+
     # AS
     test "if there's no config.active_support.bare, all of ActiveSupport is required" do
       use_frameworks []