Merge pull request #3908 from kennyj/should_use_default_charset

Fix a failure in railties on ruby 1.8.x

1 files changed, 3 insertions, 2 deletions

diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index e6e2c525f5..cf6c4d8fc2 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -137,9 +137,10 @@ module ApplicationTests
     end
 
     test "assignment config.encoding to default_charset" do
-      add_to_config "config.encoding = 'Shift_JIS'"
+      charset = "ruby".respond_to?(:force_encoding) ? 'Shift_JIS' : 'UTF8'
+      add_to_config "config.encoding = '#{charset}'"
       require "#{app_path}/config/environment"
-      assert_equal 'Shift_JIS', ActionDispatch::Response.default_charset
+      assert_equal charset, ActionDispatch::Response.default_charset
     end
 
     # AS