diff test/functional/issues_controller_test.rb @ 442:753f1380d6bc cannam

Merge from branch "redmine-1.2"

--- a/test/functional/issues_controller_test.rb	Thu Mar 03 15:08:45 2011 +0000
+++ b/test/functional/issues_controller_test.rb	Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
 # Redmine - project management software
-# Copyright (C) 2006-2008  Jean-Philippe Lang
+# Copyright (C) 2006-2011  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.
@@ -45,17 +45,17 @@
            :journals,
            :journal_details,
            :queries
-  
+
   def setup
     @controller = IssuesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     User.current = nil
   end
-  
+
   def test_index
     Setting.default_language = 'en'
-    
+
     get :index
     assert_response :success
     assert_template 'index.rhtml'
@@ -69,7 +69,7 @@
     # project column
     assert_tag :tag => 'th', :content => /Project/
   end
-  
+
   def test_index_should_not_list_issues_when_module_disabled
     EnabledModule.delete_all("name = 'issue_tracking' AND project_id = 1")
     get :index
@@ -91,7 +91,14 @@
     assert_no_tag :tag => 'a', :content => /Can't print recipes/
     assert_tag :tag => 'a', :content => /Subproject issue/
   end
-  
+
+  def test_index_should_list_visible_issues_only
+    get :index, :per_page => 100
+    assert_response :success
+    assert_not_nil assigns(:issues)
+    assert_nil assigns(:issues).detect {|issue| !issue.visible?}
+  end
+
   def test_index_with_project
     Setting.display_subprojects_issues = 0
     get :index, :project_id => 1
@@ -101,7 +108,7 @@
     assert_tag :tag => 'a', :content => /Can't print recipes/
     assert_no_tag :tag => 'a', :content => /Subproject issue/
   end
-  
+
   def test_index_with_project_and_subprojects
     Setting.display_subprojects_issues = 1
     get :index, :project_id => 1
@@ -112,7 +119,7 @@
     assert_tag :tag => 'a', :content => /Subproject issue/
     assert_no_tag :tag => 'a', :content => /Issue of a private subproject/
   end
-  
+
   def test_index_with_project_and_subprojects_should_show_private_subprojects
     @request.session[:user_id] = 2
     Setting.display_subprojects_issues = 1
@@ -124,45 +131,45 @@
     assert_tag :tag => 'a', :content => /Subproject issue/
     assert_tag :tag => 'a', :content => /Issue of a private subproject/
   end
-  
+
   def test_index_with_project_and_default_filter
     get :index, :project_id => 1, :set_filter => 1
     assert_response :success
     assert_template 'index.rhtml'
     assert_not_nil assigns(:issues)
-    
+
     query = assigns(:query)
     assert_not_nil query
     # default filter
     assert_equal({'status_id' => {:operator => 'o', :values => ['']}}, query.filters)
   end
-  
+
   def test_index_with_project_and_filter
-    get :index, :project_id => 1, :set_filter => 1, 
-      :fields => ['tracker_id'],
-      :operators => {'tracker_id' => '='},
-      :values => {'tracker_id' => ['1']} 
+    get :index, :project_id => 1, :set_filter => 1,
+      :f => ['tracker_id'],
+      :op => {'tracker_id' => '='},
+      :v => {'tracker_id' => ['1']}
     assert_response :success
     assert_template 'index.rhtml'
     assert_not_nil assigns(:issues)
-    
+
     query = assigns(:query)
     assert_not_nil query
     assert_equal({'tracker_id' => {:operator => '=', :values => ['1']}}, query.filters)
   end
-  
+
   def test_index_with_project_and_empty_filters
     get :index, :project_id => 1, :set_filter => 1, :fields => ['']
     assert_response :success
     assert_template 'index.rhtml'
     assert_not_nil assigns(:issues)
-    
+
     query = assigns(:query)
     assert_not_nil query
     # no filter
     assert_equal({}, query.filters)
   end
-  
+
   def test_index_with_query
     get :index, :project_id => 1, :query_id => 5
     assert_response :success
@@ -170,7 +177,7 @@
     assert_not_nil assigns(:issues)
     assert_nil assigns(:issue_count_by_group)
   end
-  
+
   def test_index_with_query_grouped_by_tracker
     get :index, :project_id => 1, :query_id => 6
     assert_response :success
@@ -178,7 +185,7 @@
     assert_not_nil assigns(:issues)
     assert_not_nil assigns(:issue_count_by_group)
   end
-  
+
   def test_index_with_query_grouped_by_list_custom_field
     get :index, :project_id => 1, :query_id => 9
     assert_response :success
@@ -186,15 +193,15 @@
     assert_not_nil assigns(:issues)
     assert_not_nil assigns(:issue_count_by_group)
   end
-  
+
   def test_index_sort_by_field_not_included_in_columns
     Setting.issue_list_default_columns = %w(subject author)
     get :index, :sort => 'tracker'
   end
-  
+
   def test_index_csv_with_project
     Setting.default_language = 'en'
-    
+
     get :index, :format => 'csv'
     assert_response :success
     assert_not_nil assigns(:issues)
@@ -206,24 +213,24 @@
     assert_not_nil assigns(:issues)
     assert_equal 'text/csv', @response.content_type
   end
-  
+
   def test_index_pdf
     get :index, :format => 'pdf'
     assert_response :success
     assert_not_nil assigns(:issues)
     assert_equal 'application/pdf', @response.content_type
-    
+
     get :index, :project_id => 1, :format => 'pdf'
     assert_response :success
     assert_not_nil assigns(:issues)
     assert_equal 'application/pdf', @response.content_type
-    
+
     get :index, :project_id => 1, :query_id => 6, :format => 'pdf'
     assert_response :success
     assert_not_nil assigns(:issues)
     assert_equal 'application/pdf', @response.content_type
   end
-  
+
   def test_index_pdf_with_query_grouped_by_list_custom_field
     get :index, :project_id => 1, :query_id => 9, :format => 'pdf'
     assert_response :success
@@ -231,106 +238,163 @@
     assert_not_nil assigns(:issue_count_by_group)
     assert_equal 'application/pdf', @response.content_type
   end
-  
+
   def test_index_sort
     get :index, :sort => 'tracker,id:desc'
     assert_response :success
-    
+
     sort_params = @request.session['issues_index_sort']
     assert sort_params.is_a?(String)
     assert_equal 'tracker,id:desc', sort_params
-    
+
     issues = assigns(:issues)
     assert_not_nil issues
     assert !issues.empty?
     assert_equal issues.sort {|a,b| a.tracker == b.tracker ? b.id <=> a.id : a.tracker <=> b.tracker }.collect(&:id), issues.collect(&:id)
   end
-  
+
   def test_index_with_columns
     columns = ['tracker', 'subject', 'assigned_to']
-    get :index, :set_filter => 1, :query => { 'column_names' => columns}
+    get :index, :set_filter => 1, :c => columns
     assert_response :success
-    
+
     # query should use specified columns
     query = assigns(:query)
     assert_kind_of Query, query
     assert_equal columns, query.column_names.map(&:to_s)
-    
+
     # columns should be stored in session
     assert_kind_of Hash, session[:query]
     assert_kind_of Array, session[:query][:column_names]
     assert_equal columns, session[:query][:column_names].map(&:to_s)
   end
 
+  def test_index_with_custom_field_column
+    columns = %w(tracker subject cf_2)
+    get :index, :set_filter => 1, :c => columns
+    assert_response :success
+
+    # query should use specified columns
+    query = assigns(:query)
+    assert_kind_of Query, query
+    assert_equal columns, query.column_names.map(&:to_s)
+
+    assert_tag :td,
+      :attributes => {:class => 'cf_2 string'},
+      :ancestor => {:tag => 'table', :attributes => {:class => /issues/}}
+  end
+
   def test_show_by_anonymous
     get :show, :id => 1
     assert_response :success
     assert_template 'show.rhtml'
     assert_not_nil assigns(:issue)
     assert_equal Issue.find(1), assigns(:issue)
-    
+
     # anonymous role is allowed to add a note
     assert_tag :tag => 'form',
                :descendant => { :tag => 'fieldset',
-                                :child => { :tag => 'legend', 
+                                :child => { :tag => 'legend',
                                             :content => /Notes/ } }
   end
-  
+
   def test_show_by_manager
     @request.session[:user_id] = 2
     get :show, :id => 1
     assert_response :success
-    
+
     assert_tag :tag => 'a',
       :content => /Quote/
-    
+
     assert_tag :tag => 'form',
                :descendant => { :tag => 'fieldset',
-                                :child => { :tag => 'legend', 
+                                :child => { :tag => 'legend',
                                             :content => /Change properties/ } },
                :descendant => { :tag => 'fieldset',
-                                :child => { :tag => 'legend', 
+                                :child => { :tag => 'legend',
                                             :content => /Log time/ } },
                :descendant => { :tag => 'fieldset',
-                                :child => { :tag => 'legend', 
+                                :child => { :tag => 'legend',
                                             :content => /Notes/ } }
   end
-  
+
   def test_show_should_deny_anonymous_access_without_permission
     Role.anonymous.remove_permission!(:view_issues)
     get :show, :id => 1
     assert_response :redirect
   end
-  
+
+  def test_show_should_deny_anonymous_access_to_private_issue
+    Issue.update_all(["is_private = ?", true], "id = 1")
+    get :show, :id => 1
+    assert_response :redirect
+  end
+
   def test_show_should_deny_non_member_access_without_permission
     Role.non_member.remove_permission!(:view_issues)
     @request.session[:user_id] = 9
     get :show, :id => 1
     assert_response 403
   end
-  
+
+  def test_show_should_deny_non_member_access_to_private_issue
+    Issue.update_all(["is_private = ?", true], "id = 1")
+    @request.session[:user_id] = 9
+    get :show, :id => 1
+    assert_response 403
+  end
+
   def test_show_should_deny_member_access_without_permission
     Role.find(1).remove_permission!(:view_issues)
     @request.session[:user_id] = 2
     get :show, :id => 1
     assert_response 403
   end
-  
+
+  def test_show_should_deny_member_access_to_private_issue_without_permission
+    Issue.update_all(["is_private = ?", true], "id = 1")
+    @request.session[:user_id] = 3
+    get :show, :id => 1
+    assert_response 403
+  end
+
+  def test_show_should_allow_author_access_to_private_issue
+    Issue.update_all(["is_private = ?, author_id = 3", true], "id = 1")
+    @request.session[:user_id] = 3
+    get :show, :id => 1
+    assert_response :success
+  end
+
+  def test_show_should_allow_assignee_access_to_private_issue
+    Issue.update_all(["is_private = ?, assigned_to_id = 3", true], "id = 1")
+    @request.session[:user_id] = 3
+    get :show, :id => 1
+    assert_response :success
+  end
+
+  def test_show_should_allow_member_access_to_private_issue_with_permission
+    Issue.update_all(["is_private = ?", true], "id = 1")
+    User.find(3).roles_for_project(Project.find(1)).first.update_attribute :issues_visibility, 'all'
+    @request.session[:user_id] = 3
+    get :show, :id => 1
+    assert_response :success
+  end
+
   def test_show_should_not_disclose_relations_to_invisible_issues
     Setting.cross_project_issue_relations = '1'
     IssueRelation.create!(:issue_from => Issue.find(1), :issue_to => Issue.find(2), :relation_type => 'relates')
     # Relation to a private project issue
     IssueRelation.create!(:issue_from => Issue.find(1), :issue_to => Issue.find(4), :relation_type => 'relates')
-    
+
     get :show, :id => 1
     assert_response :success
-    
+
     assert_tag :div, :attributes => { :id => 'relations' },
                      :descendant => { :tag => 'a', :content => /#2$/ }
     assert_no_tag :div, :attributes => { :id => 'relations' },
                         :descendant => { :tag => 'a', :content => /#4$/ }
   end
-  
+
   def test_show_atom
     get :show, :id => 2, :format => 'atom'
     assert_response :success
@@ -338,7 +402,7 @@
     # Inline image
     assert_select 'content', :text => Regexp.new(Regexp.quote('http://test.host/attachments/download/10'))
   end
-  
+
   def test_show_export_to_pdf
     get :show, :id => 3, :format => 'pdf'
     assert_response :success
@@ -352,7 +416,7 @@
     get :new, :project_id => 1, :tracker_id => 1
     assert_response :success
     assert_template 'new'
-    
+
     assert_tag :tag => 'input', :attributes => { :name => 'issue[custom_field_values][2]',
                                                  :value => 'Default string' }
   end
@@ -362,51 +426,51 @@
     get :new, :project_id => 1
     assert_response :success
     assert_template 'new'
-    
+
     issue = assigns(:issue)
     assert_not_nil issue
     assert_equal Project.find(1).trackers.first, issue.tracker
   end
-  
+
   def test_get_new_with_no_default_status_should_display_an_error
     @request.session[:user_id] = 2
     IssueStatus.delete_all
-    
+
     get :new, :project_id => 1
     assert_response 500
     assert_error_tag :content => /No default issue/
   end
-  
+
   def test_get_new_with_no_tracker_should_display_an_error
     @request.session[:user_id] = 2
     Tracker.delete_all
-    
+
     get :new, :project_id => 1
     assert_response 500
     assert_error_tag :content => /No tracker/
   end
-  
+
   def test_update_new_form
     @request.session[:user_id] = 2
     xhr :post, :new, :project_id => 1,
-                     :issue => {:tracker_id => 2, 
+                     :issue => {:tracker_id => 2,
                                 :subject => 'This is the test_new issue',
                                 :description => 'This is the description',
                                 :priority_id => 5}
     assert_response :success
     assert_template 'attributes'
-    
+
     issue = assigns(:issue)
     assert_kind_of Issue, issue
     assert_equal 1, issue.project_id
     assert_equal 2, issue.tracker_id
     assert_equal 'This is the test_new issue', issue.subject
   end
-  
+
   def test_post_create
     @request.session[:user_id] = 2
     assert_difference 'Issue.count' do
-      post :create, :project_id => 1, 
+      post :create, :project_id => 1,
                  :issue => {:tracker_id => 3,
                             :status_id => 2,
                             :subject => 'This is the test_new issue',
@@ -417,7 +481,7 @@
                             :custom_field_values => {'2' => 'Value for field 2'}}
     end
     assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id
-    
+
     issue = Issue.find_by_subject('This is the test_new issue')
     assert_not_nil issue
     assert_equal 2, issue.author_id
@@ -429,11 +493,11 @@
     assert_not_nil v
     assert_equal 'Value for field 2', v.value
   end
-  
+
   def test_post_create_without_start_date
     @request.session[:user_id] = 2
     assert_difference 'Issue.count' do
-      post :create, :project_id => 1, 
+      post :create, :project_id => 1,
                  :issue => {:tracker_id => 3,
                             :status_id => 2,
                             :subject => 'This is the test_new issue',
@@ -444,15 +508,15 @@
                             :custom_field_values => {'2' => 'Value for field 2'}}
     end
     assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id
-    
+
     issue = Issue.find_by_subject('This is the test_new issue')
     assert_not_nil issue
     assert_nil issue.start_date
   end
-  
+
   def test_post_create_and_continue
     @request.session[:user_id] = 2
-    post :create, :project_id => 1, 
+    post :create, :project_id => 1,
                :issue => {:tracker_id => 3,
                           :subject => 'This is first issue',
                           :priority_id => 5},
@@ -460,11 +524,11 @@
     assert_redirected_to :controller => 'issues', :action => 'new', :project_id => 'ecookbook',
                          :issue => {:tracker_id => 3}
   end
-  
+
   def test_post_create_without_custom_fields_param
     @request.session[:user_id] = 2
     assert_difference 'Issue.count' do
-      post :create, :project_id => 1, 
+      post :create, :project_id => 1,
                  :issue => {:tracker_id => 1,
                             :subject => 'This is the test_new issue',
                             :description => 'This is the description',
@@ -478,7 +542,7 @@
     field.update_attribute(:is_required, true)
 
     @request.session[:user_id] = 2
-    post :create, :project_id => 1, 
+    post :create, :project_id => 1,
                :issue => {:tracker_id => 1,
                           :subject => 'This is the test_new issue',
                           :description => 'This is the description',
@@ -489,13 +553,13 @@
     assert_not_nil issue
     assert_equal I18n.translate('activerecord.errors.messages.invalid'), issue.errors.on(:custom_values)
   end
-  
+
   def test_post_create_with_watchers
     @request.session[:user_id] = 2
     ActionMailer::Base.deliveries.clear
-    
+
     assert_difference 'Watcher.count', 2 do
-      post :create, :project_id => 1, 
+      post :create, :project_id => 1,
                  :issue => {:tracker_id => 1,
                             :subject => 'This is a new issue with watchers',
                             :description => 'This is the description',
@@ -505,7 +569,7 @@
     issue = Issue.find_by_subject('This is a new issue with watchers')
     assert_not_nil issue
     assert_redirected_to :controller => 'issues', :action => 'show', :id => issue
-    
+
     # Watchers added
     assert_equal [2, 3], issue.watcher_user_ids.sort
     assert issue.watched_by?(User.find(3))
@@ -514,12 +578,12 @@
     assert_kind_of TMail::Mail, mail
     assert [mail.bcc, mail.cc].flatten.include?(User.find(3).mail)
   end
-  
+
   def test_post_create_subissue
     @request.session[:user_id] = 2
-    
+
     assert_difference 'Issue.count' do
-      post :create, :project_id => 1, 
+      post :create, :project_id => 1,
                  :issue => {:tracker_id => 1,
                             :subject => 'This is a child issue',
                             :parent_issue_id => 2}
@@ -531,9 +595,9 @@
 
   def test_post_create_subissue_with_non_numeric_parent_id
     @request.session[:user_id] = 2
-    
+
     assert_difference 'Issue.count' do
-      post :create, :project_id => 1, 
+      post :create, :project_id => 1,
                  :issue => {:tracker_id => 1,
                             :subject => 'This is a child issue',
                             :parent_issue_id => 'ABC'}
@@ -542,12 +606,12 @@
     assert_not_nil issue
     assert_nil issue.parent
   end
-  
+
   def test_post_create_should_send_a_notification
     ActionMailer::Base.deliveries.clear
     @request.session[:user_id] = 2
     assert_difference 'Issue.count' do
-      post :create, :project_id => 1, 
+      post :create, :project_id => 1,
                  :issue => {:tracker_id => 3,
                             :subject => 'This is the test_new issue',
                             :description => 'This is the description',
@@ -556,13 +620,13 @@
                             :custom_field_values => {'2' => 'Value for field 2'}}
     end
     assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id
-    
+
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
-  
+
   def test_post_create_should_preserve_fields_values_on_validation_failure
     @request.session[:user_id] = 2
-    post :create, :project_id => 1, 
+    post :create, :project_id => 1,
                :issue => {:tracker_id => 1,
                           # empty subject
                           :subject => '',
@@ -571,35 +635,35 @@
                           :custom_field_values => {'1' => 'Oracle', '2' => 'Value for field 2'}}
     assert_response :success
     assert_template 'new'
-    
+
     assert_tag :textarea, :attributes => { :name => 'issue[description]' },
                           :content => 'This is a description'
     assert_tag :select, :attributes => { :name => 'issue[priority_id]' },
                         :child => { :tag => 'option', :attributes => { :selected => 'selected',
                                                                        :value => '6' },
-                                                      :content => 'High' }  
+                                                      :content => 'High' }
     # Custom fields
     assert_tag :select, :attributes => { :name => 'issue[custom_field_values][1]' },
                         :child => { :tag => 'option', :attributes => { :selected => 'selected',
                                                                        :value => 'Oracle' },
-                                                      :content => 'Oracle' }  
+                                                      :content => 'Oracle' }
     assert_tag :input, :attributes => { :name => 'issue[custom_field_values][2]',
                                         :value => 'Value for field 2'}
   end
-  
+
   def test_post_create_should_ignore_non_safe_attributes
     @request.session[:user_id] = 2
     assert_nothing_raised do
       post :create, :project_id => 1, :issue => { :tracker => "A param can not be a Tracker" }
     end
   end
-  
+
   context "without workflow privilege" do
     setup do
       Workflow.delete_all(["role_id = ?", Role.anonymous.id])
       Role.anonymous.add_permission! :add_issues, :add_issue_notes
     end
-    
+
     context "#new" do
       should "propose default status only" do
         get :new, :project_id => 1
@@ -610,10 +674,10 @@
           :children => {:count => 1},
           :child => {:tag => 'option', :attributes => {:value => IssueStatus.default.id.to_s}}
       end
-      
+
       should "accept default status" do
         assert_difference 'Issue.count' do
-          post :create, :project_id => 1, 
+          post :create, :project_id => 1,
                      :issue => {:tracker_id => 1,
                                 :subject => 'This is an issue',
                                 :status_id => 1}
@@ -621,21 +685,10 @@
         issue = Issue.last(:order => 'id')
         assert_equal IssueStatus.default, issue.status
       end
-      
-      should "accept default status" do
-        assert_difference 'Issue.count' do
-          post :create, :project_id => 1, 
-                     :issue => {:tracker_id => 1,
-                                :subject => 'This is an issue',
-                                :status_id => 1}
-        end
-        issue = Issue.last(:order => 'id')
-        assert_equal IssueStatus.default, issue.status
-      end
-      
+
       should "ignore unauthorized status" do
         assert_difference 'Issue.count' do
-          post :create, :project_id => 1, 
+          post :create, :project_id => 1,
                      :issue => {:tracker_id => 1,
                                 :subject => 'This is an issue',
                                 :status_id => 3}
@@ -644,7 +697,7 @@
         assert_equal IssueStatus.default, issue.status
       end
     end
-    
+
     context "#update" do
       should "ignore status change" do
         assert_difference 'Journal.count' do
@@ -652,7 +705,7 @@
         end
         assert_equal 1, Issue.find(1).status_id
       end
-      
+
       should "ignore attributes changes" do
         assert_difference 'Journal.count' do
           put :update, :id => 1, :notes => 'just trying', :issue => {:subject => 'changed', :assigned_to_id => 2}
@@ -663,7 +716,7 @@
       end
     end
   end
-  
+
   context "with workflow privilege" do
     setup do
       Workflow.delete_all(["role_id = ?", Role.anonymous.id])
@@ -671,7 +724,7 @@
       Workflow.create!(:role => Role.anonymous, :tracker_id => 1, :old_status_id => 1, :new_status_id => 4)
       Role.anonymous.add_permission! :add_issues, :add_issue_notes
     end
-    
+
     context "#update" do
       should "accept authorized status" do
         assert_difference 'Journal.count' do
@@ -679,14 +732,14 @@
         end
         assert_equal 3, Issue.find(1).status_id
       end
-      
+
       should "ignore unauthorized status" do
         assert_difference 'Journal.count' do
           put :update, :id => 1, :notes => 'just trying', :issue => {:status_id => 2}
         end
         assert_equal 1, Issue.find(1).status_id
       end
-      
+
       should "accept authorized attributes changes" do
         assert_difference 'Journal.count' do
           put :update, :id => 1, :notes => 'just trying', :issue => {:assigned_to_id => 2}
@@ -694,7 +747,7 @@
         issue = Issue.find(1)
         assert_equal 2, issue.assigned_to_id
       end
-      
+
       should "ignore unauthorized attributes changes" do
         assert_difference 'Journal.count' do
           put :update, :id => 1, :notes => 'just trying', :issue => {:subject => 'changed'}
@@ -703,7 +756,7 @@
         assert_equal "Can't print recipes", issue.subject
       end
     end
-    
+
     context "and :edit_issues permission" do
       setup do
         Role.anonymous.add_permission! :add_issues, :edit_issues
@@ -715,14 +768,14 @@
         end
         assert_equal 3, Issue.find(1).status_id
       end
-      
+
       should "ignore unauthorized status" do
         assert_difference 'Journal.count' do
           put :update, :id => 1, :notes => 'just trying', :issue => {:status_id => 2}
         end
         assert_equal 1, Issue.find(1).status_id
       end
-      
+
       should "accept authorized attributes changes" do
         assert_difference 'Journal.count' do
           put :update, :id => 1, :notes => 'just trying', :issue => {:subject => 'changed', :assigned_to_id => 2}
@@ -733,7 +786,7 @@
       end
     end
   end
-  
+
   def test_copy_issue
     @request.session[:user_id] = 2
     get :new, :project_id => 1, :copy_from => 1
@@ -742,7 +795,7 @@
     orig = Issue.find(1)
     assert_equal orig.subject, assigns(:issue).subject
   end
-  
+
   def test_get_edit
     @request.session[:user_id] = 2
     get :edit, :id => 1
@@ -751,26 +804,26 @@
     assert_not_nil assigns(:issue)
     assert_equal Issue.find(1), assigns(:issue)
   end
-  
+
   def test_get_edit_with_params
     @request.session[:user_id] = 2
     get :edit, :id => 1, :issue => { :status_id => 5, :priority_id => 7 },
         :time_entry => { :hours => '2.5', :comments => 'test_get_edit_with_params', :activity_id => TimeEntryActivity.first.id }
     assert_response :success
     assert_template 'edit'
-    
+
     issue = assigns(:issue)
     assert_not_nil issue
-    
+
     assert_equal 5, issue.status_id
     assert_tag :select, :attributes => { :name => 'issue[status_id]' },
-                        :child => { :tag => 'option', 
+                        :child => { :tag => 'option',
                                     :content => 'Closed',
                                     :attributes => { :selected => 'selected' } }
-                                    
+
     assert_equal 7, issue.priority_id
     assert_tag :select, :attributes => { :name => 'issue[priority_id]' },
-                        :child => { :tag => 'option', 
+                        :child => { :tag => 'option',
                                     :content => 'Urgent',
                                     :attributes => { :selected => 'selected' } }
 
@@ -785,13 +838,13 @@
     @request.session[:user_id] = 2
     xhr :post, :new, :project_id => 1,
                              :id => 1,
-                             :issue => {:tracker_id => 2, 
+                             :issue => {:tracker_id => 2,
                                         :subject => 'This is the test_new issue',
                                         :description => 'This is the description',
                                         :priority_id => 5}
     assert_response :success
     assert_template 'attributes'
-    
+
     issue = assigns(:issue)
     assert_kind_of Issue, issue
     assert_equal 1, issue.id
@@ -799,7 +852,7 @@
     assert_equal 2, issue.tracker_id
     assert_equal 'This is the test_new issue', issue.subject
   end
-  
+
   def test_update_using_invalid_http_verbs
     @request.session[:user_id] = 2
     subject = 'Updated by an invalid http verb'
@@ -817,12 +870,12 @@
   def test_put_update_without_custom_fields_param
     @request.session[:user_id] = 2
     ActionMailer::Base.deliveries.clear
-    
+
     issue = Issue.find(1)
     assert_equal '125', issue.custom_value_for(2).value
     old_subject = issue.subject
     new_subject = 'Subject modified by IssuesControllerTest#test_post_edit'
-    
+
     assert_difference('Journal.count') do
       assert_difference('JournalDetail.count', 2) do
         put :update, :id => 1, :issue => {:subject => new_subject,
@@ -836,18 +889,18 @@
     assert_equal new_subject, issue.subject
     # Make sure custom fields were not cleared
     assert_equal '125', issue.custom_value_for(2).value
-    
+
     mail = ActionMailer::Base.deliveries.last
     assert_kind_of TMail::Mail, mail
     assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
     assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")
   end
-  
+
   def test_put_update_with_custom_field_change
     @request.session[:user_id] = 2
     issue = Issue.find(1)
     assert_equal '125', issue.custom_value_for(2).value
-    
+
     assert_difference('Journal.count') do
       assert_difference('JournalDetail.count', 3) do
         put :update, :id => 1, :issue => {:subject => 'Custom field change',
@@ -860,12 +913,12 @@
     assert_redirected_to :action => 'show', :id => '1'
     issue.reload
     assert_equal 'New custom value', issue.custom_value_for(2).value
-    
+
     mail = ActionMailer::Base.deliveries.last
     assert_kind_of TMail::Mail, mail
     assert mail.body.include?("Searchable field changed from 125 to New custom value")
   end
-  
+
   def test_put_update_with_status_and_assignee_change
     issue = Issue.find(1)
     assert_equal 1, issue.status_id
@@ -883,13 +936,13 @@
     j = Journal.find(:first, :order => 'id DESC')
     assert_equal 'Assigned to dlopper', j.notes
     assert_equal 2, j.details.size
-    
+
     mail = ActionMailer::Base.deliveries.last
     assert mail.body.include?("Status changed from New to Assigned")
     # subject should contain the new status
     assert mail.subject.include?("(#{ IssueStatus.find(2).name })")
   end
-  
+
   def test_put_update_with_note_only
     notes = 'Note added by IssuesControllerTest#test_update_with_note_only'
     # anonymous user
@@ -901,11 +954,11 @@
     assert_equal notes, j.notes
     assert_equal 0, j.details.size
     assert_equal User.anonymous, j.user
-    
+
     mail = ActionMailer::Base.deliveries.last
     assert mail.body.include?(notes)
   end
-  
+
   def test_put_update_with_note_and_spent_time
     @request.session[:user_id] = 2
     spent_hours_before = Issue.find(1).spent_hours
@@ -916,22 +969,22 @@
            :time_entry => { :hours => '2.5', :comments => 'test_put_update_with_note_and_spent_time', :activity_id => TimeEntryActivity.first.id }
     end
     assert_redirected_to :action => 'show', :id => '1'
-    
+
     issue = Issue.find(1)
-    
+
     j = Journal.find(:first, :order => 'id DESC')
     assert_equal '2.5 hours added', j.notes
     assert_equal 0, j.details.size
-    
+
     t = issue.time_entries.find_by_comments('test_put_update_with_note_and_spent_time')
     assert_not_nil t
     assert_equal 2.5, t.hours
     assert_equal spent_hours_before + 2.5, issue.spent_hours
   end
-  
+
   def test_put_update_with_attachment_only
     set_tmp_attachments_directory
-    
+
     # Delete all fixtured journals, a race condition can occur causing the wrong
     # journal to get fetched in the next find.
     Journal.delete_all
@@ -947,21 +1000,21 @@
     assert_equal 1, j.details.size
     assert_equal 'testfile.txt', j.details.first.value
     assert_equal User.anonymous, j.user
-    
+
     mail = ActionMailer::Base.deliveries.last
     assert mail.body.include?('testfile.txt')
   end
 
   def test_put_update_with_attachment_that_fails_to_save
     set_tmp_attachments_directory
-    
+
     # Delete all fixtured journals, a race condition can occur causing the wrong
     # journal to get fetched in the next find.
     Journal.delete_all
 
     # Mock out the unsaved attachment
     Attachment.any_instance.stubs(:create).returns(Attachment.new)
-    
+
     # anonymous user
     put :update,
          :id => 1,
@@ -976,12 +1029,12 @@
     issue = Issue.find(1)
     issue.journals.clear
     ActionMailer::Base.deliveries.clear
-    
+
     put :update,
          :id => 1,
          :notes => ''
     assert_redirected_to :action => 'show', :id => '1'
-    
+
     issue.reload
     assert issue.journals.empty?
     # No email should be sent
@@ -994,18 +1047,18 @@
     issue = Issue.find(1)
     old_subject = issue.subject
     new_subject = 'Subject modified by IssuesControllerTest#test_post_edit'
-    
+
     put :update, :id => 1, :issue => {:subject => new_subject,
                                      :priority_id => '6',
                                      :category_id => '1' # no change
                                     }
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
-  
-  def test_put_update_with_invalid_spent_time
+
+  def test_put_update_with_invalid_spent_time_hours_only
     @request.session[:user_id] = 2
     notes = 'Note added by IssuesControllerTest#test_post_edit_with_invalid_spent_time'
-    
+
     assert_no_difference('Journal.count') do
       put :update,
            :id => 1,
@@ -1014,12 +1067,31 @@
     end
     assert_response :success
     assert_template 'edit'
-    
-    assert_tag :textarea, :attributes => { :name => 'notes' },
-                          :content => notes
+
+    assert_error_tag :descendant => {:content => /Activity can't be blank/}
+    assert_tag :textarea, :attributes => { :name => 'notes' }, :content => notes
     assert_tag :input, :attributes => { :name => 'time_entry[hours]', :value => "2z" }
   end
-  
+
+  def test_put_update_with_invalid_spent_time_comments_only
+    @request.session[:user_id] = 2
+    notes = 'Note added by IssuesControllerTest#test_post_edit_with_invalid_spent_time'
+
+    assert_no_difference('Journal.count') do
+      put :update,
+           :id => 1,
+           :notes => notes,
+           :time_entry => {"comments"=>"this is my comment", "activity_id"=>"", "hours"=>""}
+    end
+    assert_response :success
+    assert_template 'edit'
+
+    assert_error_tag :descendant => {:content => /Activity can't be blank/}
+    assert_error_tag :descendant => {:content => /Hours can't be blank/}
+    assert_tag :textarea, :attributes => { :name => 'notes' }, :content => notes
+    assert_tag :input, :attributes => { :name => 'time_entry[comments]', :value => "this is my comment" }
+  end
+
   def test_put_update_should_allow_fixed_version_to_be_set_to_a_subproject
     issue = Issue.find(2)
     @request.session[:user_id] = 2
@@ -1050,7 +1122,7 @@
     assert_response :redirect
     assert_redirected_to '/issues'
   end
-  
+
   def test_put_update_should_not_redirect_back_using_the_back_url_parameter_off_the_host
     issue = Issue.find(2)
     @request.session[:user_id] = 2
@@ -1065,19 +1137,21 @@
     assert_response :redirect
     assert_redirected_to :controller => 'issues', :action => 'show', :id => issue.id
   end
-  
+
   def test_get_bulk_edit
     @request.session[:user_id] = 2
     get :bulk_edit, :ids => [1, 2]
     assert_response :success
     assert_template 'bulk_edit'
-    
+
+    assert_tag :input, :attributes => {:name => 'issue[parent_issue_id]'}
+
     # Project specific custom field, date type
     field = CustomField.find(9)
     assert !field.is_for_all?
     assert_equal 'date', field.field_format
     assert_tag :input, :attributes => {:name => 'issue[custom_field_values][9]'}
-    
+
     # System wide custom field
     assert CustomField.find(1).is_for_all?
     assert_tag :select, :attributes => {:name => 'issue[custom_field_values][1]'}
@@ -1088,7 +1162,10 @@
     get :bulk_edit, :ids => [1, 2, 6]
     assert_response :success
     assert_template 'bulk_edit'
-    
+
+    # Can not set issues from different projects as children of an issue
+    assert_no_tag :input, :attributes => {:name => 'issue[parent_issue_id]'}
+
     # Project specific custom field, date type
     field = CustomField.find(9)
     assert !field.is_for_all?
@@ -1096,6 +1173,38 @@
     assert_no_tag :input, :attributes => {:name => 'issue[custom_field_values][9]'}
   end
 
+  def test_get_bulk_edit_with_user_custom_field
+    field = IssueCustomField.create!(:name => 'Tester', :field_format => 'user', :is_for_all => true)
+
+    @request.session[:user_id] = 2
+    get :bulk_edit, :ids => [1, 2]
+    assert_response :success
+    assert_template 'bulk_edit'
+
+    assert_tag :select,
+      :attributes => {:name => "issue[custom_field_values][#{field.id}]"},
+      :children => {
+        :only => {:tag => 'option'},
+        :count => Project.find(1).users.count + 1
+      }
+  end
+
+  def test_get_bulk_edit_with_version_custom_field
+    field = IssueCustomField.create!(:name => 'Affected version', :field_format => 'version', :is_for_all => true)
+
+    @request.session[:user_id] = 2
+    get :bulk_edit, :ids => [1, 2]
+    assert_response :success
+    assert_template 'bulk_edit'
+
+    assert_tag :select,
+      :attributes => {:name => "issue[custom_field_values][#{field.id}]"},
+      :children => {
+        :only => {:tag => 'option'},
+        :count => Project.find(1).versions.count + 1
+      }
+  end
+
   def test_bulk_update
     @request.session[:user_id] = 2
     # update issues priority
@@ -1103,11 +1212,11 @@
                                      :issue => {:priority_id => 7,
                                                 :assigned_to_id => '',
                                                 :custom_field_values => {'2' => ''}}
-                                     
+
     assert_response 302
     # check that the issues were updated
     assert_equal [7, 7], Issue.find_all_by_id([1, 2]).collect {|i| i.priority.id}
-    
+
     issue = Issue.find(1)
     journal = issue.journals.find(:first, :order => 'created_on DESC')
     assert_equal '125', issue.custom_value_for(2).value
@@ -1122,11 +1231,11 @@
                                      :issue => {:priority_id => 7,
                                                 :assigned_to_id => '',
                                                 :custom_field_values => {'2' => ''}}
-    
+
     assert_response 302
     # check that the issues were updated
     assert_equal [7, 7, 7], Issue.find([1,2,6]).map(&:priority_id)
-    
+
     issue = Issue.find(1)
     journal = issue.journals.find(:first, :order => 'created_on DESC')
     assert_equal '125', issue.custom_value_for(2).value
@@ -1147,7 +1256,7 @@
     assert_response 403
     assert_not_equal "Bulk should fail", Journal.last.notes
   end
-    
+
   def test_bullk_update_should_send_a_notification
     @request.session[:user_id] = 2
     ActionMailer::Base.deliveries.clear
@@ -1173,12 +1282,25 @@
                                      :issue => {:priority_id => '',
                                                 :assigned_to_id => '',
                                                 :status_id => '5'}
-                                     
+
     assert_response 302
     issue = Issue.find(1)
     assert issue.closed?
   end
 
+  def test_bulk_update_parent_id
+    @request.session[:user_id] = 2
+    post :bulk_update, :ids => [1, 3],
+      :notes => 'Bulk editing parent',
+      :issue => {:priority_id => '', :assigned_to_id => '', :status_id => '', :parent_issue_id => '2'}
+
+    assert_response 302
+    parent = Issue.find(2)
+    assert_equal parent.id, Issue.find(1).parent_id
+    assert_equal parent.id, Issue.find(3).parent_id
+    assert_equal [1, 3], parent.children.collect(&:id).sort
+  end
+
   def test_bulk_update_custom_field
     @request.session[:user_id] = 2
     # update issues priority
@@ -1186,9 +1308,9 @@
                                      :issue => {:priority_id => '',
                                                 :assigned_to_id => '',
                                                 :custom_field_values => {'2' => '777'}}
-                                     
+
     assert_response 302
-    
+
     issue = Issue.find(1)
     journal = issue.journals.find(:first, :order => 'created_on DESC')
     assert_equal '777', issue.custom_value_for(2).value
@@ -1206,7 +1328,7 @@
     # check that the issues were updated
     assert_nil Issue.find(2).assigned_to
   end
-  
+
   def test_post_bulk_update_should_allow_fixed_version_to_be_set_to_a_subproject
     @request.session[:user_id] = 2
 
@@ -1235,7 +1357,7 @@
     assert_response :redirect
     assert_redirected_to :controller => 'issues', :action => 'index', :project_id => Project.find(1).identifier
   end
-  
+
   def test_destroy_issue_with_no_time_entries
     assert_nil TimeEntry.find_by_issue_id(2)
     @request.session[:user_id] = 2
@@ -1269,7 +1391,7 @@
     assert_nil TimeEntry.find(1).issue_id
     assert_nil TimeEntry.find(2).issue_id
   end
-  
+
   def test_destroy_issues_and_reassign_time_entries_to_another_issue
     @request.session[:user_id] = 2
     post :destroy, :ids => [1, 3], :todo => 'reassign', :reassign_to_id => 2
@@ -1278,14 +1400,26 @@
     assert_equal 2, TimeEntry.find(1).issue_id
     assert_equal 2, TimeEntry.find(2).issue_id
   end
-  
+
   def test_destroy_issues_from_different_projects
     @request.session[:user_id] = 2
     post :destroy, :ids => [1, 2, 6], :todo => 'destroy'
     assert_redirected_to :controller => 'issues', :action => 'index'
     assert !(Issue.find_by_id(1) || Issue.find_by_id(2) || Issue.find_by_id(6))
   end
-  
+
+  def test_destroy_parent_and_child_issues
+    parent = Issue.generate!(:project_id => 1, :tracker_id => 1)
+    child = Issue.generate!(:project_id => 1, :tracker_id => 1, :parent_issue_id => parent.id)
+    assert child.is_descendant_of?(parent.reload)
+
+    @request.session[:user_id] = 2
+    assert_difference 'Issue.count', -2 do
+      post :destroy, :ids => [parent.id, child.id], :todo => 'destroy'
+    end
+    assert_response 302
+  end
+
   def test_default_search_scope
     get :index
     assert_tag :div, :attributes => {:id => 'quick-search'},