aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-04 15:57:13 -0800
committerJosé Valim <jose.valim@gmail.com>2011-12-04 15:57:13 -0800
commitcf6ccf0ebd632ae5a8d4fc3b30ba47eff9837eef (patch)
tree31c2d7914f343f8a4fa1065ebdd7b66930f2ec3e /activerecord/test
parent4ded0dd2de4dca40fcb7ccbc215db4c098a6629d (diff)
parenta8134aceb363d581d6b49aeb08feeadaf474d051 (diff)
downloadrails-cf6ccf0ebd632ae5a8d4fc3b30ba47eff9837eef.tar.gz
rails-cf6ccf0ebd632ae5a8d4fc3b30ba47eff9837eef.tar.bz2
rails-cf6ccf0ebd632ae5a8d4fc3b30ba47eff9837eef.zip
Merge pull request #3854 from exviva/validates_associated_marked_for_destruction
Do not validate associated records marked for destruction
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/validations/association_validation_test.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/activerecord/test/cases/validations/association_validation_test.rb b/activerecord/test/cases/validations/association_validation_test.rb
index 56e345990f..768fbc5b0a 100644
--- a/activerecord/test/cases/validations/association_validation_test.rb
+++ b/activerecord/test/cases/validations/association_validation_test.rb
@@ -61,6 +61,16 @@ class AssociationValidationTest < ActiveRecord::TestCase
assert r.valid?
end
+ def test_validates_associated_marked_for_destruction
+ Topic.validates_associated(:replies)
+ Reply.validates_presence_of(:content)
+ t = Topic.new
+ t.replies << Reply.new
+ assert t.invalid?
+ t.replies.first.mark_for_destruction
+ assert t.valid?
+ end
+
def test_validates_associated_with_custom_message_using_quotes
Reply.validates_associated :topic, :message=> "This string contains 'single' and \"double\" quotes"
Topic.validates_presence_of :content