Default status per tracker (#5991).

git-svn-id: http://svn.redmine.org/redmine/trunk@13535 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 files changed, 174 insertions, 51 deletions

diff --git a/test/fixtures/issue_statuses.yml b/test/fixtures/issue_statuses.yml
index ff40b1c50..56a58f20a 100644
--- a/test/fixtures/issue_statuses.yml
+++ b/test/fixtures/issue_statuses.yml
@@ -2,36 +2,30 @@
 issue_statuses_001: 
   id: 1
   name: New
-  is_default: true
   is_closed: false
   position: 1
 issue_statuses_002: 
   id: 2
   name: Assigned
-  is_default: false
   is_closed: false
   position: 2
 issue_statuses_003: 
   id: 3
   name: Resolved
-  is_default: false
   is_closed: false
   position: 3
 issue_statuses_004: 
   name: Feedback
   id: 4
-  is_default: false
   is_closed: false
   position: 4
 issue_statuses_005: 
   id: 5
   name: Closed
-  is_default: false
   is_closed: true
   position: 5
 issue_statuses_006: 
   id: 6
   name: Rejected
-  is_default: false
   is_closed: true
   position: 6
diff --git a/test/fixtures/trackers.yml b/test/fixtures/trackers.yml
index 43395a2e8..c969549f6 100644
--- a/test/fixtures/trackers.yml
+++ b/test/fixtures/trackers.yml
@@ -3,14 +3,17 @@ trackers_001:
   name: Bug
   id: 1
   is_in_chlog: true
+  default_status_id: 1
   position: 1
 trackers_002: 
   name: Feature request
   id: 2
   is_in_chlog: true
+  default_status_id: 1
   position: 2
 trackers_003: 
   name: Support request
   id: 3
   is_in_chlog: false
+  default_status_id: 1
   position: 3
diff --git a/test/functional/issue_statuses_controller_test.rb b/test/functional/issue_statuses_controller_test.rb
index 59fff8141..b8e0ea5b5 100644
--- a/test/functional/issue_statuses_controller_test.rb
+++ b/test/functional/issue_statuses_controller_test.rb
@@ -86,7 +86,8 @@ class IssueStatusesControllerTest < ActionController::TestCase
   end
 
   def test_destroy
-    Issue.delete_all("status_id = 1")
+    Issue.where(:status_id => 1).delete_all
+    Tracker.where(:default_status_id => 1).delete_all
 
     assert_difference 'IssueStatus.count', -1 do
       delete :destroy, :id => '1'
@@ -96,7 +97,19 @@ class IssueStatusesControllerTest < ActionController::TestCase
   end
 
   def test_destroy_should_block_if_status_in_use
-    assert_not_nil Issue.find_by_status_id(1)
+    assert Issue.where(:status_id => 1).any?
+    Tracker.where(:default_status_id => 1).delete_all
+
+    assert_no_difference 'IssueStatus.count' do
+      delete :destroy, :id => '1'
+    end
+    assert_redirected_to :action => 'index'
+    assert_not_nil IssueStatus.find_by_id(1)
+  end
+
+  def test_destroy_should_block_if_status_in_use
+    Issue.where(:status_id => 1).delete_all
+    assert Tracker.where(:default_status_id => 1).any?
 
     assert_no_difference 'IssueStatus.count' do
       delete :destroy, :id => '1'
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 6b2dd7110..8ffb9c848 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1511,6 +1511,30 @@ class IssuesControllerTest < ActionController::TestCase
     end
   end
 
+  def test_new_should_select_default_status
+    @request.session[:user_id] = 2
+
+    get :new, :project_id => 1
+    assert_response :success
+    assert_template 'new'
+    assert_select 'select[name=?]', 'issue[status_id]' do
+      assert_select 'option[value=1][selected=selected]'
+    end
+    assert_select 'input[name=was_default_status][value=1]'
+  end
+
+  def test_new_should_select_default_status
+    @request.session[:user_id] = 2
+
+    get :new, :project_id => 1
+    assert_response :success
+    assert_template 'new'
+    assert_select 'select[name=?]', 'issue[status_id]' do
+      assert_select 'option[value=1][selected=selected]'
+    end
+    assert_select 'input[name=was_default_status][value=1]'
+  end
+
   def test_get_new_with_list_custom_field
     @request.session[:user_id] = 2
     get :new, :project_id => 1, :tracker_id => 1
@@ -1731,6 +1755,20 @@ class IssuesControllerTest < ActionController::TestCase
     assert_equal [1,2,5], assigns(:allowed_statuses).map(&:id).sort
   end
 
+  def test_update_form_with_default_status_should_ignore_submitted_status_id_if_equals
+    @request.session[:user_id] = 2
+    tracker = Tracker.find(2)
+    tracker.update! :default_status_id => 2
+    tracker.generate_transitions! 2, 1, :clear => true
+
+    xhr :post, :update_form, :project_id => 1,
+                     :issue => {:tracker_id => 2,
+                                :status_id => 1},
+                     :was_default_status => 1
+
+    assert_equal 2, assigns(:issue).status_id
+  end
+
   def test_post_create
     @request.session[:user_id] = 2
     assert_difference 'Issue.count' do
@@ -2266,13 +2304,17 @@ class IssuesControllerTest < ActionController::TestCase
     get :new, :project_id => 1
     assert_response :success
     assert_template 'new'
+    
+    issue = assigns(:issue)
+    assert_not_nil issue.default_status
+
     assert_select 'select[name=?]', 'issue[status_id]' do
       assert_select 'option', 1
-      assert_select 'option[value=?]', IssueStatus.default.id.to_s
+      assert_select 'option[value=?]', issue.default_status.id.to_s
     end
   end
 
-  test "without workflow privilege #new should accept default status" do
+  test "without workflow privilege #create should accept default status" do
     setup_without_workflow_privilege
     assert_difference 'Issue.count' do
       post :create, :project_id => 1,
@@ -2281,10 +2323,11 @@ class IssuesControllerTest < ActionController::TestCase
                                 :status_id => 1}
     end
     issue = Issue.order('id').last
-    assert_equal IssueStatus.default, issue.status
+    assert_not_nil issue.default_status
+    assert_equal issue.default_status, issue.status
   end
 
-  test "without workflow privilege #new should ignore unauthorized status" do
+  test "without workflow privilege #create should ignore unauthorized status" do
     setup_without_workflow_privilege
     assert_difference 'Issue.count' do
       post :create, :project_id => 1,
@@ -2293,7 +2336,8 @@ class IssuesControllerTest < ActionController::TestCase
                                 :status_id => 3}
     end
     issue = Issue.order('id').last
-    assert_equal IssueStatus.default, issue.status
+    assert_not_nil issue.default_status
+    assert_equal issue.default_status, issue.status
   end
 
   test "without workflow privilege #update should ignore status change" do
diff --git a/test/functional/trackers_controller_test.rb b/test/functional/trackers_controller_test.rb
index e5246ce59..4e872926c 100644
--- a/test/functional/trackers_controller_test.rb
+++ b/test/functional/trackers_controller_test.rb
@@ -18,7 +18,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 class TrackersControllerTest < ActionController::TestCase
-  fixtures :trackers, :projects, :projects_trackers, :users, :issues, :custom_fields
+  fixtures :trackers, :projects, :projects_trackers, :users, :issues, :custom_fields, :issue_statuses
 
   def setup
     User.current = nil
@@ -51,7 +51,7 @@ class TrackersControllerTest < ActionController::TestCase
 
   def test_create
     assert_difference 'Tracker.count' do
-      post :create, :tracker => { :name => 'New tracker', :project_ids => ['1', '', ''], :custom_field_ids => ['1', '6', ''] }
+      post :create, :tracker => { :name => 'New tracker', :default_status_id => 1, :project_ids => ['1', '', ''], :custom_field_ids => ['1', '6', ''] }
     end
     assert_redirected_to :action => 'index'
     tracker = Tracker.order('id DESC').first
@@ -62,9 +62,9 @@ class TrackersControllerTest < ActionController::TestCase
     assert_equal 0, tracker.workflow_rules.count
   end
 
-  def create_with_disabled_core_fields
+  def test_create_with_disabled_core_fields
     assert_difference 'Tracker.count' do
-      post :create, :tracker => { :name => 'New tracker', :core_fields => ['assigned_to_id', 'fixed_version_id', ''] }
+      post :create, :tracker => { :name => 'New tracker', :default_status_id => 1, :core_fields => ['assigned_to_id', 'fixed_version_id', ''] }
     end
     assert_redirected_to :action => 'index'
     tracker = Tracker.order('id DESC').first
@@ -74,7 +74,7 @@ class TrackersControllerTest < ActionController::TestCase
 
   def test_create_new_with_workflow_copy
     assert_difference 'Tracker.count' do
-      post :create, :tracker => { :name => 'New tracker' }, :copy_workflow_from => 1
+      post :create, :tracker => { :name => 'New tracker', :default_status_id => 1 }, :copy_workflow_from => 1
     end
     assert_redirected_to :action => 'index'
     tracker = Tracker.find_by_name('New tracker')
@@ -164,7 +164,7 @@ class TrackersControllerTest < ActionController::TestCase
   end
 
   def test_destroy
-    tracker = Tracker.create!(:name => 'Destroyable')
+    tracker = Tracker.generate!(:name => 'Destroyable')
     assert_difference 'Tracker.count', -1 do
       delete :destroy, :id => tracker.id
     end
diff --git a/test/object_helpers.rb b/test/object_helpers.rb
index f3c671bf5..ca58638d9 100644
--- a/test/object_helpers.rb
+++ b/test/object_helpers.rb
@@ -45,11 +45,22 @@ module ObjectHelpers
     project
   end
 
+  def IssueStatus.generate!(attributes={})
+    @generated_status_name ||= 'Status 0'
+    @generated_status_name.succ!
+    status = IssueStatus.new(attributes)
+    status.name = @generated_status_name.dup if status.name.blank?
+    yield status if block_given?
+    status.save!
+    status
+  end
+
   def Tracker.generate!(attributes={})
     @generated_tracker_name ||= 'Tracker 0'
     @generated_tracker_name.succ!
     tracker = Tracker.new(attributes)
     tracker.name = @generated_tracker_name.dup if tracker.name.blank?
+    tracker.default_status ||= IssueStatus.order('position').first || IssueStatus.generate!
     yield tracker if block_given?
     tracker.save!
     tracker
@@ -188,6 +199,27 @@ module ObjectHelpers
   end
 end
 
+module TrackerObjectHelpers
+  def generate_transitions!(*args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    if args.size == 1
+      args << args.first
+    end
+    if options[:clear]
+      WorkflowTransition.where(:tracker_id => id).delete_all
+    end
+    args.each_cons(2) do |old_status_id, new_status_id|
+      WorkflowTransition.create!(
+        :tracker => self,
+        :role_id => (options[:role_id] || 1),
+        :old_status_id => old_status_id,
+        :new_status_id => new_status_id
+      )
+    end
+  end
+end
+Tracker.send :include, TrackerObjectHelpers
+
 module IssueObjectHelpers
   def close!
     self.status = IssueStatus.where(:is_closed => true).first
@@ -198,5 +230,4 @@ module IssueObjectHelpers
     Issue.generate!(attributes.merge(:parent_issue_id => self.id))
   end
 end
-
 Issue.send :include, IssueObjectHelpers
diff --git a/test/unit/issue_status_test.rb b/test/unit/issue_status_test.rb
index 387fa16a6..cb4ed90b8 100644
--- a/test/unit/issue_status_test.rb
+++ b/test/unit/issue_status_test.rb
@@ -28,7 +28,6 @@ class IssueStatusTest < ActiveSupport::TestCase
 
     status.name = "Test Status"
     assert status.save
-    assert !status.is_default
   end
 
   def test_destroy
@@ -46,29 +45,6 @@ class IssueStatusTest < ActiveSupport::TestCase
     assert_raise(RuntimeError, "Can't delete status") { status.destroy }
   end
 
-  def test_default
-    status = IssueStatus.default
-    assert_kind_of IssueStatus, status
-  end
-
-  def test_change_default
-    status = IssueStatus.find(2)
-    assert !status.is_default
-    status.is_default = true
-    assert status.save
-    status.reload
-
-    assert_equal status, IssueStatus.default
-    assert !IssueStatus.find(1).is_default
-  end
-
-  def test_reorder_should_not_clear_default_status
-    status = IssueStatus.default
-    status.move_to_bottom
-    status.reload
-    assert status.is_default?
-  end
-
   def test_new_statuses_allowed_to
     WorkflowTransition.delete_all
 
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 834792458..46ae8bc51 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -40,11 +40,11 @@ class IssueTest < ActiveSupport::TestCase
 
     assert_nil issue.project_id
     assert_nil issue.tracker_id
+    assert_nil issue.status_id
     assert_nil issue.author_id
     assert_nil issue.assigned_to_id
     assert_nil issue.category_id
 
-    assert_equal IssueStatus.default, issue.status
     assert_equal IssuePriority.default, issue.priority
   end
 
@@ -59,10 +59,9 @@ class IssueTest < ActiveSupport::TestCase
   end
 
   def test_create_minimal
-    issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3,
-                      :status_id => 1, :priority => IssuePriority.all.first,
-                      :subject => 'test_create')
+    issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3, :subject => 'test_create')
     assert issue.save
+    assert_equal issue.tracker.default_status, issue.status
     assert issue.description.nil?
     assert_nil issue.estimated_hours
   end
@@ -908,7 +907,7 @@ class IssueTest < ActiveSupport::TestCase
 
   def test_copy_should_copy_status
     orig = Issue.find(8)
-    assert orig.status != IssueStatus.default
+    assert orig.status != orig.default_status
 
     issue = Issue.new.copy_from(orig)
     assert issue.save
@@ -2480,4 +2479,67 @@ class IssueTest < ActiveSupport::TestCase
     issue.save!
     assert_equal false, issue.reopening?
   end
+
+  def test_default_status_without_tracker_should_be_nil
+    issue = Issue.new
+    assert_nil issue.tracker
+    assert_nil issue.default_status
+  end
+
+  def test_default_status_should_be_tracker_default_status
+    issue = Issue.new(:tracker_id => 1)
+    assert_not_nil issue.status
+    assert_equal issue.tracker.default_status, issue.default_status
+  end
+
+  def test_initializing_with_tracker_should_set_default_status
+    issue = Issue.new(:tracker => Tracker.find(1))
+    assert_not_nil issue.status
+    assert_equal issue.default_status, issue.status
+  end
+
+  def test_initializing_with_tracker_id_should_set_default_status
+    issue = Issue.new(:tracker_id => 1)
+    assert_not_nil issue.status
+    assert_equal issue.default_status, issue.status
+  end
+
+  def test_setting_tracker_should_set_default_status
+    issue = Issue.new
+    issue.tracker = Tracker.find(1)
+    assert_not_nil issue.status
+    assert_equal issue.default_status, issue.status
+  end
+
+  def test_changing_tracker_should_set_default_status_if_status_was_default
+    WorkflowTransition.delete_all
+    WorkflowTransition.create! :role_id => 1, :tracker_id => 2, :old_status_id => 2, :new_status_id => 1
+    Tracker.find(2).update! :default_status_id => 2
+
+    issue = Issue.new(:tracker_id => 1, :status_id => 1)
+    assert_equal IssueStatus.find(1), issue.status
+    issue.tracker = Tracker.find(2)
+    assert_equal IssueStatus.find(2), issue.status
+  end
+
+  def test_changing_tracker_should_set_default_status_if_status_is_not_used_by_tracker
+    WorkflowTransition.delete_all
+    Tracker.find(2).update! :default_status_id => 2
+
+    issue = Issue.new(:tracker_id => 1, :status_id => 3)
+    assert_equal IssueStatus.find(3), issue.status
+    issue.tracker = Tracker.find(2)
+    assert_equal IssueStatus.find(2), issue.status
+  end
+
+  def test_changing_tracker_should_keep_status_if_status_was_not_default_and_is_used_by_tracker
+    WorkflowTransition.delete_all
+    WorkflowTransition.create! :role_id => 1, :tracker_id => 2, :old_status_id => 2, :new_status_id => 3
+    Tracker.find(2).update! :default_status_id => 2
+
+    issue = Issue.new(:tracker_id => 1, :status_id => 3)
+    assert_equal IssueStatus.find(3), issue.status
+    issue.tracker = Tracker.find(2)
+    assert_equal IssueStatus.find(3), issue.status
+  end
 end
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index bb91ac3f7..6d250a4e2 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -412,7 +412,7 @@ class MailHandlerTest < ActiveSupport::TestCase
 
   def test_add_issue_with_japanese_keywords
     ja_dev = "\xe9\x96\x8b\xe7\x99\xba".force_encoding('UTF-8')
-    tracker = Tracker.create!(:name => ja_dev)
+    tracker = Tracker.generate!(:name => ja_dev)
     Project.find(1).trackers << tracker
     issue = submit_email(
               'japanese_keywords_iso_2022_jp.eml',
diff --git a/test/unit/tracker_test.rb b/test/unit/tracker_test.rb
index 70d892b77..d9a445133 100644
--- a/test/unit/tracker_test.rb
+++ b/test/unit/tracker_test.rb
@@ -32,7 +32,7 @@ class TrackerTest < ActiveSupport::TestCase
     source = Tracker.find(1)
     assert_equal 89, source.workflow_rules.size
 
-    target = Tracker.new(:name => 'Target')
+    target = Tracker.new(:name => 'Target', :default_status_id => 1)
     assert target.save
     target.workflow_rules.copy(source)
     target.reload