From aaec0072922166442457ded88c39cb5372ea5e67 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Sun, 15 Aug 2010 16:29:27 -0700
Subject: Make sure apps upgrading from 2.3 get defaulted to UTF-8 (ht: parndt)

---
 railties/lib/rails/application/configuration.rb |  2 +-
 railties/test/application/configuration_test.rb | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 465851c0e6..c3418e0d80 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -16,9 +16,9 @@ module Rails
 
       def initialize(*)
         super
+        self.encoding = "utf-8"
         @allow_concurrency = false
         @consider_all_requests_local = false
-        @encoding = "utf-8"
         @filter_parameters = []
         @dependency_loading = true
         @serve_static_assets = true
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 9928ee2c52..d63d25b42e 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -172,17 +172,27 @@ module ApplicationTests
       assert $prepared
     end
 
+    def assert_utf8
+      if RUBY_VERSION < '1.9'
+        assert_equal "UTF8", $KCODE
+      else
+        assert_equal Encoding::UTF_8, Encoding.default_external
+        assert_equal Encoding::UTF_8, Encoding.default_internal
+      end
+    end
+
+    test "skipping config.encoding still results in 'utf-8' as the default" do
+      require "#{app_path}/config/application"
+      assert_utf8
+    end
+
     test "config.encoding sets the default encoding" do
       add_to_config <<-RUBY
         config.encoding = "utf-8"
       RUBY
 
       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
-      end
+      assert_utf8
     end
 
     test "config.paths.public sets Rails.public_path" do
-- 
cgit v1.2.3