Makes new issue initial status settable in workflow (#5816).

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

5 files changed, 106 insertions, 7 deletions

diff --git a/test/fixtures/workflows.yml b/test/fixtures/workflows.yml
index d544545b3..7eb5481bb 100644
--- a/test/fixtures/workflows.yml
+++ b/test/fixtures/workflows.yml
@@ -1882,3 +1882,45 @@ WorkflowTransitions_188:
   id: 188
   tracker_id: 3
   type: WorkflowTransition
+WorkflowTransitions_271: 
+  new_status_id: 3
+  role_id: 1
+  old_status_id: 0
+  id: 271
+  tracker_id: 2
+  type: WorkflowTransition
+WorkflowTransitions_272: 
+  new_status_id: 3
+  role_id: 2
+  old_status_id: 0
+  id: 272
+  tracker_id: 1
+  type: WorkflowTransition
+WorkflowTransitions_273: 
+  new_status_id: 2
+  role_id: 1
+  old_status_id: 0
+  id: 273
+  tracker_id: 3
+  type: WorkflowTransition
+WorkflowTransitions_274: 
+  new_status_id: 2
+  role_id: 1
+  old_status_id: 0
+  id: 274
+  tracker_id: 1
+  type: WorkflowTransition
+WorkflowTransitions_275: 
+  new_status_id: 1
+  role_id: 1
+  old_status_id: 0
+  id: 275
+  tracker_id: 1
+  type: WorkflowTransition
+WorkflowTransitions_276: 
+  new_status_id: 1
+  role_id: 1
+  old_status_id: 0
+  id: 276
+  tracker_id: 2
+  type: WorkflowTransition
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index f642d582d..4aa89c64e 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1602,6 +1602,37 @@ class IssuesControllerTest < ActionController::TestCase
     assert_select 'input[name=was_default_status][value="1"]'
   end
 
+  def test_new_should_propose_allowed_statuses
+    WorkflowTransition.delete_all
+    WorkflowTransition.create!(:tracker_id => 1, :role_id => 1, :old_status_id => 0, :new_status_id => 1)
+    WorkflowTransition.create!(:tracker_id => 1, :role_id => 1, :old_status_id => 0, :new_status_id => 3)
+    @request.session[:user_id] = 2
+
+    get :new, :project_id => 1
+    assert_response :success
+    assert_select 'select[name=?]', 'issue[status_id]' do
+      assert_select 'option[value="1"]'
+      assert_select 'option[value="3"]'
+      assert_select 'option', 2
+      assert_select 'option[value="1"][selected=selected]'
+    end
+  end
+
+  def test_new_should_propose_allowed_statuses_without_default_status_allowed
+    WorkflowTransition.delete_all
+    WorkflowTransition.create!(:tracker_id => 1, :role_id => 1, :old_status_id => 0, :new_status_id => 2)
+    assert_equal 1, Tracker.find(1).default_status_id
+    @request.session[:user_id] = 2
+
+    get :new, :project_id => 1
+    assert_response :success
+    assert_select 'select[name=?]', 'issue[status_id]' do
+      assert_select 'option[value="2"]'
+      assert_select 'option', 1
+      assert_select 'option[value="2"][selected=selected]'
+    end
+  end
+
   def test_get_new_with_list_custom_field
     @request.session[:user_id] = 2
     get :new, :project_id => 1, :tracker_id => 1
@@ -1827,8 +1858,8 @@ class IssuesControllerTest < ActionController::TestCase
   def test_update_form_for_new_issue_should_propose_transitions_based_on_initial_status
     @request.session[:user_id] = 2
     WorkflowTransition.delete_all
-    WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2)
-    WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 5)
+    WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 0, :new_status_id => 2)
+    WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 0, :new_status_id => 5)
     WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 5, :new_status_id => 4)
 
     xhr :post, :new, :project_id => 1,
@@ -1837,7 +1868,7 @@ class IssuesControllerTest < ActionController::TestCase
                                 :subject => 'This is an issue'}
 
     assert_equal 5, assigns(:issue).status_id
-    assert_equal [1,2,5], assigns(:allowed_statuses).map(&:id).sort
+    assert_equal [2,5], assigns(:allowed_statuses).map(&:id).sort
   end
 
   def test_update_form_with_default_status_should_ignore_submitted_status_id_if_equals
diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb
index d59614aea..2f455c499 100644
--- a/test/functional/workflows_controller_test.rb
+++ b/test/functional/workflows_controller_test.rb
@@ -61,6 +61,16 @@ class WorkflowsControllerTest < ActionController::TestCase
     assert_select 'input[type=checkbox][name=?]', 'transitions[1][1][always]', 0
   end
 
+  def test_get_edit_should_include_allowed_statuses_for_new_issues
+    WorkflowTransition.delete_all
+    WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 0, :new_status_id => 1)
+
+    get :edit, :role_id => 1, :tracker_id => 1
+    assert_response :success
+    assert_select 'td', 'New issue'
+    assert_select 'input[type=checkbox][name=?][value="1"][checked=checked]', 'transitions[0][1][always]'
+  end
+
   def test_get_edit_with_all_roles_and_all_trackers
     get :edit, :role_id => 'all', :tracker_id => 'all'
     assert_response :success
@@ -96,6 +106,20 @@ class WorkflowsControllerTest < ActionController::TestCase
     assert_nil      WorkflowTransition.where(:role_id => 2, :tracker_id => 1, :old_status_id => 5, :new_status_id => 4).first
   end
 
+  def test_post_edit_with_allowed_statuses_for_new_issues
+    WorkflowTransition.delete_all
+
+    post :edit, :role_id => 2, :tracker_id => 1,
+      :transitions => {
+        '0' => {'1' => {'always' => '1'}, '2' => {'always' => '1'}}
+      }
+    assert_response 302
+
+    assert WorkflowTransition.where(:role_id => 2, :tracker_id => 1, :old_status_id => 0, :new_status_id => 1).any?
+    assert WorkflowTransition.where(:role_id => 2, :tracker_id => 1, :old_status_id => 0, :new_status_id => 2).any?
+    assert_equal 2, WorkflowTransition.where(:tracker_id => 1, :role_id => 2).count
+  end
+
   def test_post_edit_with_additional_transitions
     WorkflowTransition.delete_all
   
diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb
index f2107ad23..2dc99864a 100644
--- a/test/unit/role_test.rb
+++ b/test/unit/role_test.rb
@@ -47,13 +47,14 @@ class RoleTest < ActiveSupport::TestCase
 
   def test_copy_workflows
     source = Role.find(1)
-    assert_equal 90, source.workflow_rules.size
+    rule_count = source.workflow_rules.count
+    assert rule_count > 0
 
     target = Role.new(:name => 'Target')
     assert target.save
     target.workflow_rules.copy(source)
     target.reload
-    assert_equal 90, target.workflow_rules.size
+    assert_equal rule_count, target.workflow_rules.size
   end
 
   def test_permissions_should_be_unserialized_with_its_coder
diff --git a/test/unit/tracker_test.rb b/test/unit/tracker_test.rb
index d9a445133..f766a3ab4 100644
--- a/test/unit/tracker_test.rb
+++ b/test/unit/tracker_test.rb
@@ -30,13 +30,14 @@ class TrackerTest < ActiveSupport::TestCase
 
   def test_copy_workflows
     source = Tracker.find(1)
-    assert_equal 89, source.workflow_rules.size
+    rules_count = source.workflow_rules.count
+    assert rules_count > 0
 
     target = Tracker.new(:name => 'Target', :default_status_id => 1)
     assert target.save
     target.workflow_rules.copy(source)
     target.reload
-    assert_equal 89, target.workflow_rules.size
+    assert_equal rules_count, target.workflow_rules.size
   end
 
   def test_issue_statuses