Add tests for moving within scope and add method: move_within_scope

lib/acts_as_list/active_record/acts/list.rb

@@ -164,6 +164,12 @@ def remove_from_list
  end
  end
 
+ # Move the item within scope
+ def move_within_scope(scope_id)
+ send("#{scope_name}=", scope_id)
+ save!
+ end
+
  # Increase the position of this item without adjusting the rest of the list.
  def increment_position
  return unless in_list?
@@ -409,6 +415,7 @@ def check_scope
  self["#{scope_name}"] = old_scope_id
  send("decrement_positions_on_lower_items")
  self["#{scope_name}"] = new_scope_id
+ send("#{position_column}=", nil)
  send("add_to_list_#{add_new_at}")
  end
  end

test/shared_list.rb

@@ -109,6 +109,8 @@ def test_insert_at
  def test_delete_middle
  assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
 
+
+
  ListMixin.find(2).destroy
 
  assert_equal [1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
@@ -138,6 +140,24 @@ def test_nil_scope
  assert_equal [new2, new1, new3], ListMixin.find(:all, :conditions => 'parent_id IS NULL', :order => 'pos')
  end
 
+ def test_update_position_when_scope_changes
+ assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+ parent = ListMixin.create(:id => 6)
+
+ ListMixin.find(2).move_within_scope(6)
+
+ assert_equal 1, ListMixin.find(2).pos
+
+ assert_equal [1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+ assert_equal 1, ListMixin.find(1).pos
+ assert_equal 2, ListMixin.find(3).pos
+ assert_equal 3, ListMixin.find(4).pos
+
+ ListMixin.find(2).move_within_scope(5)
+ assert_equal [1, 3, 4, 2], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+ end
+
  def test_remove_from_list_should_then_fail_in_list?
  assert_equal true, ListMixin.find(1).in_list?
  ListMixin.find(1).remove_from_list