Isolate the test that actually require non transactional fixtures.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10610 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 59 insertions, 25 deletions

diff --git a/test/unit/issue_nested_set_test.rb b/test/unit/issue_nested_set_test.rb
index 921cddc99..fff827ae7 100644
--- a/test/unit/issue_nested_set_test.rb
+++ b/test/unit/issue_nested_set_test.rb
@@ -27,8 +27,6 @@ class IssueNestedSetTest < ActiveSupport::TestCase
            :custom_fields, :custom_fields_projects, :custom_fields_trackers, :custom_values,
            :time_entries
 
-  self.use_transactional_fixtures = false
-
   def test_create_root_issue
     issue1 = create_issue!
     issue2 = create_issue!
@@ -159,29 +157,6 @@ class IssueNestedSetTest < ActiveSupport::TestCase
     assert_equal [2, child.id, 2, 3], [grandchild.project_id, grandchild.root_id, grandchild.lft, grandchild.rgt]
   end
 
-  def test_invalid_move_to_another_project
-    parent1 = create_issue!
-    child =   create_issue!(:parent_issue_id => parent1.id)
-    grandchild = create_issue!(:parent_issue_id => child.id, :tracker_id => 2)
-    Project.find(2).tracker_ids = [1]
-
-    parent1.reload
-    assert_equal [1, parent1.id, 1, 6], [parent1.project_id, parent1.root_id, parent1.lft, parent1.rgt]
-
-    # child can not be moved to Project 2 because its child is on a disabled tracker
-    child = Issue.find(child.id)
-    child.project = Project.find(2)
-    assert !child.save
-    child.reload
-    grandchild.reload
-    parent1.reload
-
-    # no change
-    assert_equal [1, parent1.id, 1, 6], [parent1.project_id, parent1.root_id, parent1.lft, parent1.rgt]
-    assert_equal [1, parent1.id, 2, 5], [child.project_id, child.root_id, child.lft, child.rgt]
-    assert_equal [1, parent1.id, 3, 4], [grandchild.project_id, grandchild.root_id, grandchild.lft, grandchild.rgt]
-  end
-
   def test_moving_an_issue_to_a_descendant_should_not_validate
     parent1 = create_issue!
     parent2 = create_issue!
diff --git a/test/unit/issue_transaction_test.rb b/test/unit/issue_transaction_test.rb
new file mode 100644
index 000000000..14cefeea2
--- /dev/null
+++ b/test/unit/issue_transaction_test.rb
@@ -0,0 +1,59 @@
+# Redmine - project management software
+# Copyright (C) 2006-2012  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 IssueTransactionTest < ActiveSupport::TestCase
+  fixtures :projects, :users, :members, :member_roles, :roles,
+           :trackers, :projects_trackers,
+           :versions,
+           :issue_statuses, :issue_categories, :issue_relations, :workflows,
+           :enumerations,
+           :issues,
+           :custom_fields, :custom_fields_projects, :custom_fields_trackers, :custom_values,
+           :time_entries
+
+  self.use_transactional_fixtures = false
+
+  def test_invalid_move_to_another_project
+    parent1 = create_issue!
+    child =   create_issue!(:parent_issue_id => parent1.id)
+    grandchild = create_issue!(:parent_issue_id => child.id, :tracker_id => 2)
+    Project.find(2).tracker_ids = [1]
+
+    parent1.reload
+    assert_equal [1, parent1.id, 1, 6], [parent1.project_id, parent1.root_id, parent1.lft, parent1.rgt]
+
+    # child can not be moved to Project 2 because its child is on a disabled tracker
+    child = Issue.find(child.id)
+    child.project = Project.find(2)
+    assert !child.save
+    child.reload
+    grandchild.reload
+    parent1.reload
+
+    # no change
+    assert_equal [1, parent1.id, 1, 6], [parent1.project_id, parent1.root_id, parent1.lft, parent1.rgt]
+    assert_equal [1, parent1.id, 2, 5], [child.project_id, child.root_id, child.lft, child.rgt]
+    assert_equal [1, parent1.id, 3, 4], [grandchild.project_id, grandchild.root_id, grandchild.lft, grandchild.rgt]
+  end
+
+  # Helper that creates an issue with default attributes
+  def create_issue!(attributes={})
+    Issue.create!({:project_id => 1, :tracker_id => 1, :author_id => 1, :subject => 'test'}.merge(attributes))
+  end
+end