1 files changed, 21 insertions, 10 deletions
diff --git a/railties/test/initializer/check_ruby_version_test.rb b/railties/test/initializer/check_ruby_version_test.rb
index 1852fea4df..97d884e1be 100644
--- a/railties/test/initializer/check_ruby_version_test.rb
+++ b/railties/test/initializer/check_ruby_version_test.rb
@@ -7,30 +7,39 @@ module InitializerTests
     def setup
       build_app
       boot_rails
+      require "rails"
     end
 
     test "rails does not initialize with ruby version 1.8.1" do
       assert_rails_does_not_boot "1.8.1"
     end
 
-    test "rails initializes with ruby version 1.8.2" do
-      assert_rails_boots "1.8.2"
+    test "rails does not initialize with ruby version 1.8.2" do
+      assert_rails_does_not_boot "1.8.2"
     end
 
     test "rails does not initialize with ruby version 1.8.3" do
       assert_rails_does_not_boot "1.8.3"
     end
 
-    test "rails initializes with ruby version 1.8.4" do
-      assert_rails_boots "1.8.4"
+    test "rails does not initialize with ruby version 1.8.4" do
+      assert_rails_does_not_boot "1.8.4"
     end
 
-    test "rails initializes with ruby version 1.8.5" do
-      assert_rails_boots "1.8.5"
+    test "rails does not initializes with ruby version 1.8.5" do
+      assert_rails_does_not_boot "1.8.5"
     end
 
-    test "rails initializes with ruby version 1.8.6" do
-      assert_rails_boots "1.8.6"
+    test "rails does not initialize with ruby version 1.8.6" do
+      assert_rails_does_not_boot "1.8.6"
+    end
+
+    test "rails initializes with ruby version 1.8.7" do
+      assert_rails_boots "1.8.7"
+    end
+
+    test "rails initializes with the current version of Ruby" do
+      assert_rails_boots
     end
 
     def set_ruby_version(version)
@@ -38,10 +47,11 @@ module InitializerTests
       Object.const_set(:RUBY_VERSION, version.freeze)
     end
 
-    def assert_rails_boots(version)
-      set_ruby_version(version)
+    def assert_rails_boots(version = nil)
+      set_ruby_version(version) if version
       assert_nothing_raised "It appears that rails does not boot" do
         Rails::Initializer.run { |c| c.frameworks = [] }
+        Rails.initialize!
       end
     end
 
@@ -50,6 +60,7 @@ module InitializerTests
       $stderr = File.open("/dev/null", "w")
       assert_raises(SystemExit) do
         Rails::Initializer.run { |c| c.frameworks = [] }
+        Rails.initialize!
       end
     end
   end