diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-15 13:07:03 -0200 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-15 13:07:03 -0200 |
commit | 63970dc7db273551f977483109dde936c8a7554f (patch) | |
tree | 483506262d05bb4d0d59b2f39c375be6cb559ca6 /activerecord/test | |
parent | 823604ec1659109eedeb2db91de325d413c73452 (diff) | |
parent | cfa4c640402f536da896b231506681fb3a96a0d4 (diff) | |
download | rails-63970dc7db273551f977483109dde936c8a7554f.tar.gz rails-63970dc7db273551f977483109dde936c8a7554f.tar.bz2 rails-63970dc7db273551f977483109dde936c8a7554f.zip |
Merge branch 'revert-binds-3-2' into 3-2-stable
This has been resulting in some hard to track bugs and is introducing
a possible breackage in a stable version. The issue it currently "fixes"
should be handled in some other way.
Closes #8743. Related to #7983.
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/associations/has_many_associations_test.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb index b4788e0a3d..869ec1e4b8 100644 --- a/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_associations_test.rb @@ -1225,13 +1225,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert companies(:first_firm).clients.include?(Client.find(2)) end - def test_included_in_collection_for_new_records - client = Client.create(:name => 'Persisted') - assert_nil client.client_of - assert !Firm.new.clients_of_firm.include?(client), - 'includes a client that does not belong to any firm' - end - def test_adding_array_and_collection assert_nothing_raised { Firm.find(:first).clients + Firm.find(:all).last.clients } end |