diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-11 18:53:52 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-11 18:53:52 -0300 |
| commit | 1fa76a2f3de5276001afe5d6815136680f7a87de (patch) | |
| tree | 64d8b7647daa94a131211432961d811f1cdd3f2c /activerecord/test/cases | |
| parent | 75af032c2502db2eea53c72e1cd8069dc094b920 (diff) | |
| parent | a94e2db05ccd0d4ae7681d26b4ce929184cffefc (diff) | |
| download | rails-1fa76a2f3de5276001afe5d6815136680f7a87de.tar.gz rails-1fa76a2f3de5276001afe5d6815136680f7a87de.tar.bz2 rails-1fa76a2f3de5276001afe5d6815136680f7a87de.zip | |
Merge pull request #12135 from dylanahsmith/avoid_empty_transaction
Avoid empty transaction from setting has_one association on new record.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/associations/has_one_associations_test.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb index 4fdf9a9643..9cd4db8dc9 100644 --- a/activerecord/test/cases/associations/has_one_associations_test.rb +++ b/activerecord/test/cases/associations/has_one_associations_test.rb @@ -505,6 +505,8 @@ class HasOneAssociationsTest < ActiveRecord::TestCase assert_no_queries { company.account = nil } account = Account.find(2) assert_queries { company.account = account } + + assert_no_queries { Firm.new.account = account } end def test_has_one_assignment_triggers_save_on_change |