diff options
author | José Valim <jose.valim@gmail.com> | 2011-12-20 23:08:28 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-12-20 23:08:28 -0800 |
commit | 8e749cd4bd3d3cefa75636fb9ade1672c3c980d3 (patch) | |
tree | 617c59b60762a8af25b3a81466fa6db06102f0ce /activerecord/test/cases | |
parent | e5916862a13e913629236cc5f817de72e52a8af2 (diff) | |
parent | b4073c9ea9b04da81e95d5c1fdb985b812019147 (diff) | |
download | rails-8e749cd4bd3d3cefa75636fb9ade1672c3c980d3.tar.gz rails-8e749cd4bd3d3cefa75636fb9ade1672c3c980d3.tar.bz2 rails-8e749cd4bd3d3cefa75636fb9ade1672c3c980d3.zip |
Merge pull request #4085 from arunagw/more_1_8_7_removal
No Ruby 1.8 stuff. No more checks in code.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/associations/extension_test.rb | 10 | ||||
-rw-r--r-- | activerecord/test/cases/base_test.rb | 15 |
2 files changed, 0 insertions, 25 deletions
diff --git a/activerecord/test/cases/associations/extension_test.rb b/activerecord/test/cases/associations/extension_test.rb index 395b59258d..d7c489c2b5 100644 --- a/activerecord/test/cases/associations/extension_test.rb +++ b/activerecord/test/cases/associations/extension_test.rb @@ -36,11 +36,6 @@ class AssociationsExtensionsTest < ActiveRecord::TestCase 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 @@ class AssociationsExtensionsTest < ActiveRecord::TestCase 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 index e34b0f655e..daef577c97 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1981,11 +1981,6 @@ class BasicsTest < ActiveRecord::TestCase 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,11 +1989,6 @@ class BasicsTest < ActiveRecord::TestCase 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) @@ -2006,11 +1996,6 @@ class BasicsTest < ActiveRecord::TestCase 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 |