Update Ruby version check to 1.8.7

2 files changed, 20 insertions, 19 deletions

diff --git a/railties/lib/rails/ruby_version_check.rb b/railties/lib/rails/ruby_version_check.rb
index 68d3acc876..62d7804bf3 100644
--- a/railties/lib/rails/ruby_version_check.rb
+++ b/railties/lib/rails/ruby_version_check.rb
@@ -1,13 +1,6 @@
-min_release  = "1.8.2 (2004-12-25)"
+min_release  = "1.8.7"
 ruby_release = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
-if ruby_release =~ /1\.8\.3/
-  abort <<-end_message
-
-    Rails does not work with Ruby version 1.8.3.
-    Please upgrade to version 1.8.4 or downgrade to 1.8.2.
-
-  end_message
-elsif ruby_release < min_release
+if ruby_release < min_release
   abort <<-end_message
 
     Rails requires Ruby version #{min_release} or later.
diff --git a/railties/test/initializer/check_ruby_version_test.rb b/railties/test/initializer/check_ruby_version_test.rb
index cf956e68fb..97d884e1be 100644
--- a/railties/test/initializer/check_ruby_version_test.rb
+++ b/railties/test/initializer/check_ruby_version_test.rb
@@ -14,24 +14,32 @@ module InitializerTests
       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)
@@ -39,8 +47,8 @@ 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!