diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-15 13:01:13 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-15 13:01:13 -0200 |
| commit | da5e5c5f779355a2e99e63a90612cbeaeb0fc986 (patch) | |
| tree | 216e24f855e84473808766d7a58d20c953b6a2d8 /activerecord/test | |
| parent | 823604ec1659109eedeb2db91de325d413c73452 (diff) | |
| download | rails-da5e5c5f779355a2e99e63a90612cbeaeb0fc986.tar.gz rails-da5e5c5f779355a2e99e63a90612cbeaeb0fc986.tar.bz2 rails-da5e5c5f779355a2e99e63a90612cbeaeb0fc986.zip | |
Revert "Merge pull request #7983 from georgebrock/bug7950-squashed"
This reverts commit 88a296dccc401da143d90cad54b693ff06bf2b58, reversing
changes made to 666a7e34f553cef4c8878362eafc79c7e3f310c3.
Conflicts:
activerecord/CHANGELOG.md
Reason: this has been resulting in some hard to track bugs and is
introducing a possible breackage in a stable version.
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 |