Changeset 9129

Timestamp:

03/29/08 17:53:44 (4 months ago)

Author:

david

Message:

Fixed that validates_size_of :within works in associations (closes #11295, #10019) [cavalle]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/validations.rb (modified) (2 diffs)
• trunk/activerecord/test/cases/validations_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that validates_size_of :within works in associations #11295, #10019 [cavalle]
-
-* Track changes to unsaved attributes.  [Jeremy Kemper]

trunk/activerecord/lib/active_record/validations.rb

@@ -554 +554 @@
-
-            validates_each(attrs, options) do |record, attr, value|
-
+
+
-                record.errors.add(attr, too_short)
-plit(//).s
+
-                record.errors.add(attr, too_long)
-              end
@@ -570 +571 @@
-
-            validates_each(attrs, options) do |record, attr, value|
-
-
-
-
-
+
+
-            end
-        end

trunk/activerecord/test/cases/validations_test.rb

@@ -806 +806 @@
-    reply = t.replies.build('title' => 'areply', 'content' => 'whateveragain')
-    assert t.valid?
+  end
+  
+  def test_validates_size_of_association_using_within
+    assert_nothing_raised { Topic.validates_size_of :replies, :within => 1..2 }
+    t = Topic.new('title' => 'noreplies', 'content' => 'whatever')
+    assert !t.save
+    assert t.errors.on(:replies)
+    
+    reply = t.replies.build('title' => 'areply', 'content' => 'whateveragain')
+    assert t.valid?
+    
+    2.times { t.replies.build('title' => 'areply', 'content' => 'whateveragain') }
+    assert !t.save
+    assert t.errors.on(:replies)
-  end
-