Merge pull request #4085 from arunagw/more_1_8_7_removal

No Ruby 1.8 stuff. No more checks in code.
rails · Dec 21, 2011 · 8e749cd · 8e749cd
2 parents e591686 + b4073c9
commit 8e749cd
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 25 deletions.
diff --git a/activerecord/test/cases/associations/extension_test.rb b/activerecord/test/cases/associations/extension_test.rb
@@ -36,11 +36,6 @@ def test_extension_with_scopes
   end
 
   def test_marshalling_extensions
-    if ENV['TRAVIS'] && RUBY_VERSION == "1.8.7"
-      return skip("Marshalling tests disabled for Ruby 1.8.7 on Travis CI due to what appears " \
-                  "to be a Ruby bug.")
-    end
-
     david = developers(:david)
     assert_equal projects(:action_controller), david.projects.find_most_recent
 
@@ -51,11 +46,6 @@ def test_marshalling_extensions
   end
 
   def test_marshalling_named_extensions
-    if ENV['TRAVIS'] && RUBY_VERSION == "1.8.7"
-      return skip("Marshalling tests disabled for Ruby 1.8.7 on Travis CI due to what appears " \
-                  "to be a Ruby bug.")
-    end
-
     david = developers(:david)
     assert_equal projects(:action_controller), david.projects_extended_by_name.find_most_recent
 

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
@@ -1981,11 +1981,6 @@ def test_current_scope_is_reset
   end
 
   def test_marshal_round_trip
-    if ENV['TRAVIS'] && RUBY_VERSION == "1.8.7"
-      return skip("Marshalling tests disabled for Ruby 1.8.7 on Travis CI due to what appears " \
-                  "to be a Ruby bug.")
-    end
-
     expected = posts(:welcome)
     marshalled = Marshal.dump(expected)
     actual   = Marshal.load(marshalled)
@@ -1994,23 +1989,13 @@ def test_marshal_round_trip
   end
 
   def test_marshal_new_record_round_trip
-    if ENV['TRAVIS'] && RUBY_VERSION == "1.8.7"
-      return skip("Marshalling tests disabled for Ruby 1.8.7 on Travis CI due to what appears " \
-                  "to be a Ruby bug.")
-    end
-
     marshalled = Marshal.dump(Post.new)
     post       = Marshal.load(marshalled)
 
     assert post.new_record?, "should be a new record"
   end
 
   def test_marshalling_with_associations
-    if ENV['TRAVIS'] && RUBY_VERSION == "1.8.7"
-      return skip("Marshalling tests disabled for Ruby 1.8.7 on Travis CI due to what appears " \
-                  "to be a Ruby bug.")
-    end
-
     post = Post.new
     post.comments.build