4 files changed, 110 insertions, 19 deletions
diff --git a/test/unit/enumeration_test.rb b/test/unit/enumeration_test.rb
index 3695e144d..ba64440de 100644
--- a/test/unit/enumeration_test.rb
+++ b/test/unit/enumeration_test.rb
@@ -155,6 +155,7 @@ class EnumerationTest < ActiveSupport::TestCase
     b = IssuePriority.create!(:name => 'B')
     override = IssuePriority.create!(:name => 'BB', :parent_id => b.id)
     b.move_to = 'higher'
+    b.save!
 
     assert_equal [2, 1, 1], [a, b, override].map(&:reload).map(&:position)
   end
diff --git a/test/unit/issue_priority_test.rb b/test/unit/issue_priority_test.rb
index b4aa0852b..bc4202d74 100644
--- a/test/unit/issue_priority_test.rb
+++ b/test/unit/issue_priority_test.rb
@@ -55,25 +55,6 @@ class IssuePriorityTest < ActiveSupport::TestCase
     assert_equal [1, 2, 3], priorities.map(&:position)
   end
 
-  def test_reset_positions_in_list_should_set_sequential_positions
-    IssuePriority.delete_all
-
-    priorities = [1, 2, 3].map {|i| IssuePriority.create!(:name => "P#{i}")}
-    priorities[0].update_attribute :position, 4
-    priorities[1].update_attribute :position, 2
-    priorities[2].update_attribute :position, 7
-    assert_equal [4, 2, 7], priorities.map(&:reload).map(&:position)
-
-    priorities[0].reset_positions_in_list
-    assert_equal [2, 1, 3], priorities.map(&:reload).map(&:position)
-  end
-
-  def test_moving_in_list_should_reset_positions
-    priority = IssuePriority.first
-    priority.expects(:reset_positions_in_list).once
-    priority.move_to = 'higher'
-  end
-
   def test_clear_position_names_should_set_position_names_to_nil
     IssuePriority.clear_position_names
     assert IssuePriority.all.all? {|priority| priority.position_name.nil?}
@@ -102,6 +83,7 @@ class IssuePriorityTest < ActiveSupport::TestCase
   def test_moving_a_priority_should_update_position_names
     prio = IssuePriority.first
     prio.move_to = 'lowest'
+    prio.save!
     prio.reload
     assert_equal 'highest', prio.position_name
   end
diff --git a/test/unit/lib/redmine/acts/positioned_with_scope_test.rb b/test/unit/lib/redmine/acts/positioned_with_scope_test.rb
new file mode 100644
index 000000000..68db9c723
--- /dev/null
+++ b/test/unit/lib/redmine/acts/positioned_with_scope_test.rb
@@ -0,0 +1,53 @@
+# Redmine - project management software
+# Copyright (C) 2006-2016  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../../../../test_helper', __FILE__)
+
+class Redmine::Acts::PositionedWithScopeTest < ActiveSupport::TestCase
+  fixtures :projects, :boards
+
+  def test_create_should_default_to_last_position
+    b = Board.generate!(:project_id => 1)
+    assert_equal 3, b.reload.position
+
+    b = Board.generate!(:project_id => 3)
+    assert_equal 1, b.reload.position
+  end
+
+  def test_create_should_insert_at_given_position
+    b = Board.generate!(:project_id => 1, :position => 2)
+
+    assert_equal 2, b.reload.position
+    assert_equal [1, 3, 1, 2], Board.order(:id).pluck(:position)
+  end
+
+  def test_destroy_should_remove_position
+    b = Board.generate!(:project_id => 1, :position => 2)
+    b.destroy
+
+    assert_equal [1, 2, 1], Board.order(:id).pluck(:position)
+  end
+
+  def test_update_should_update_positions
+    b = Board.generate!(:project_id => 1)
+    assert_equal 3, b.position
+
+    b.position = 2
+    b.save!
+    assert_equal [1, 3, 1, 2], Board.order(:id).pluck(:position)
+  end
+end
diff --git a/test/unit/lib/redmine/acts/positioned_without_scope_test.rb b/test/unit/lib/redmine/acts/positioned_without_scope_test.rb
new file mode 100644
index 000000000..40c0147bd
--- /dev/null
+++ b/test/unit/lib/redmine/acts/positioned_without_scope_test.rb
@@ -0,0 +1,55 @@
+# Redmine - project management software
+# Copyright (C) 2006-2016  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../../../../test_helper', __FILE__)
+
+class Redmine::Acts::PositionedWithoutScopeTest < ActiveSupport::TestCase
+  fixtures :trackers, :issue_statuses
+
+  def test_create_should_default_to_last_position
+    t = Tracker.generate
+    t.save!
+
+    assert_equal 4, t.reload.position
+  end
+
+  def test_create_should_insert_at_given_position
+    t = Tracker.generate
+    t.position = 2
+    t.save!
+
+    assert_equal 2, t.reload.position
+    assert_equal [1, 3, 4, 2], Tracker.order(:id).pluck(:position)
+  end
+
+  def test_destroy_should_remove_position
+    t = Tracker.generate!
+    Tracker.generate!
+    t.destroy
+
+    assert_equal [1, 2, 3, 4], Tracker.order(:id).pluck(:position)
+  end
+
+  def test_update_should_update_positions
+    t = Tracker.generate!
+    assert_equal 4, t.position
+
+    t.position = 2
+    t.save!
+    assert_equal [1, 3, 4, 2], Tracker.order(:id).pluck(:position)
+  end
+end