diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-05-16 13:52:51 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-05-16 13:55:29 -0700 |
| commit | ade756fe42423033bae8e5aea8f58782f7a6c517 (patch) | |
| tree | 5fecc7c19ef8b6984765928999d8ddbb99771afd /railties/test | |
| parent | 821e15e5f2d9ef2aa43918a16cbd00f40c221e95 (diff) | |
| download | rails-ade756fe42423033bae8e5aea8f58782f7a6c517.tar.gz rails-ade756fe42423033bae8e5aea8f58782f7a6c517.tar.bz2 rails-ade756fe42423033bae8e5aea8f58782f7a6c517.zip | |
Moved encoding work in progress to a feature branch.
This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c.
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/configuration_test.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index c08bd2ef22..dfc4e2359b 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -180,8 +180,7 @@ module ApplicationTests require "#{app_path}/config/application" unless RUBY_VERSION < '1.9' - assert_equal Encoding::UTF_8, Encoding.default_external - assert_equal Encoding::UTF_8, Encoding.default_internal + assert_equal Encoding.find("utf-8"), Encoding.default_external end end |