aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-05-17 19:41:54 +0400
committerwycats <wycats@gmail.com>2010-05-17 19:41:54 +0400
commit80b60671f7216c571ea8711d1de8ca824aefbe54 (patch)
treec84be59be24bbd978b257ac526eb9b0f9051389f /railties/test/application
parent5371242384171dc0255716e31e9257ddeec17d10 (diff)
downloadrails-80b60671f7216c571ea8711d1de8ca824aefbe54.tar.gz
rails-80b60671f7216c571ea8711d1de8ca824aefbe54.tar.bz2
rails-80b60671f7216c571ea8711d1de8ca824aefbe54.zip
Revert "Moved encoding work in progress to a feature branch."
This reverts commit ade756fe42423033bae8e5aea8f58782f7a6c517.
Diffstat (limited to 'railties/test/application')
-rw-r--r--railties/test/application/configuration_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index dfc4e2359b..c08bd2ef22 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -180,7 +180,8 @@ module ApplicationTests
require "#{app_path}/config/application"
unless RUBY_VERSION < '1.9'
- assert_equal Encoding.find("utf-8"), Encoding.default_external
+ assert_equal Encoding::UTF_8, Encoding.default_external
+ assert_equal Encoding::UTF_8, Encoding.default_internal
end
end