2 files changed, 2 insertions, 45 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 28ffff58ca..8f2e6e9ac0 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -189,12 +189,8 @@ module ApplicationTests
     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
+      assert_equal Encoding::UTF_8, Encoding.default_external
+      assert_equal Encoding::UTF_8, Encoding.default_internal
     end
 
     test "skipping config.encoding still results in 'utf-8' as the default" do
diff --git a/railties/test/application/initializers/check_ruby_version_test.rb b/railties/test/application/initializers/check_ruby_version_test.rb
deleted file mode 100644
index df7e9696a9..0000000000
--- a/railties/test/application/initializers/check_ruby_version_test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require "isolation/abstract_unit"
-
-module ApplicationTests
-  class CheckRubyVersionTest < Test::Unit::TestCase
-    include ActiveSupport::Testing::Isolation
-
-    def setup
-      build_app
-      boot_rails
-    end
-
-    def teardown
-      teardown_app
-    end
-
-    test "rails initializes with ruby 1.8.7 or later, except for 1.9.1" do
-      if RUBY_VERSION < '1.8.7'
-        assert_rails_does_not_boot
-      elsif RUBY_VERSION == '1.9.1'
-        assert_rails_does_not_boot
-      else
-        assert_rails_boots
-      end
-    end
-
-    def assert_rails_boots
-      assert_nothing_raised "It appears that rails does not boot" do
-        require "rails/all"
-      end
-    end
-
-    def assert_rails_does_not_boot
-      $stderr = File.open("/dev/null", "w")
-      assert_raises(SystemExit) do
-        require "rails/all"
-      end
-    end
-  end
-end