diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-08 08:55:03 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-08 08:55:03 -0800 |
| commit | 7b1930a9b2a7ed7d9767d9d7e969f01b66ab5485 (patch) | |
| tree | 62c199453251eda0076a2aaf0e1e16dcf8de7fbd /railties/test/application | |
| parent | 1bad06aebee04f3ea61c40d7a6e5fd20ebc05f49 (diff) | |
| parent | d4d2e8eb2e744e8a46f20a794b8923820fbacbe5 (diff) | |
| download | rails-7b1930a9b2a7ed7d9767d9d7e969f01b66ab5485.tar.gz rails-7b1930a9b2a7ed7d9767d9d7e969f01b66ab5485.tar.bz2 rails-7b1930a9b2a7ed7d9767d9d7e969f01b66ab5485.zip | |
Merge pull request #3908 from kennyj/should_use_default_charset
Fix a failure in railties on ruby 1.8.x
Diffstat (limited to 'railties/test/application')
| -rw-r--r-- | railties/test/application/initializers/frameworks_test.rb | 5 |
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 |