Changeset 7815

Timestamp:

10/09/07 05:16:43 (1 year ago)

Author:

nzkoz

Message:

Make sure acts_as_list's remove_from_list and in_list? play nicely with one another. Closes #8822 [mikel]

Files:

• branches/1-2-stable/activerecord/lib/active_record/acts/list.rb (modified) (2 diffs)
• branches/1-2-stable/activerecord/test/mixin_test.rb (modified) (1 diff)

branches/1-2-stable/activerecord/lib/active_record/acts/list.rb

@@ -64 +64 @@
-            #{scope_condition_method}
-            
-after_destroy 
+before_destroy
-            before_create  :add_to_list_bottom
-          EOV
@@ -122 +122 @@
-        # Removes the item from the list.
-        def remove_from_list
-
+
+
+
+
-        end
-

branches/1-2-stable/activerecord/test/mixin_test.rb

@@ -212 +212 @@
-  end
-
+  def test_remove_from_list_should_then_fail_in_list?
+    assert_equal true, mixins(:list_1).in_list?
+    mixins(:list_1).remove_from_list
+    assert_equal false, mixins(:list_1).in_list?
+  end
+
+  def test_remove_from_list_should_set_position_to_nil
+    assert_equal [mixins(:list_1),
+                  mixins(:list_2),
+                  mixins(:list_3),
+                  mixins(:list_4)],
+                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos')
+
+    mixins(:list_2).remove_from_list
+
+    assert_equal [mixins(:list_2, :reload),
+                  mixins(:list_1, :reload),
+                  mixins(:list_3, :reload),
+                  mixins(:list_4, :reload)],
+                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos')
+
+    assert_equal 1, mixins(:list_1).pos
+    assert_equal nil, mixins(:list_2).pos
+    assert_equal 2, mixins(:list_3).pos
+    assert_equal 3, mixins(:list_4).pos
+  end
+
+  def test_remove_before_destroy_does_not_shift_lower_items_twice
+    assert_equal [mixins(:list_1),
+                  mixins(:list_2),
+                  mixins(:list_3),
+                  mixins(:list_4)],
+                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos')
+
+    mixins(:list_2).remove_from_list
+    mixins(:list_2).destroy
+
+  assert_equal [mixins(:list_1, :reload),
+                mixins(:list_3, :reload),
+                mixins(:list_4, :reload)],
+                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos')
+
+    assert_equal 1, mixins(:list_1).pos
+    assert_equal 2, mixins(:list_3).pos
+    assert_equal 3, mixins(:list_4).pos
+  end
+
-end
-