2010-04-12 21:43:01 +04:00
|
|
|
# Redmine - project management software
|
2014-01-30 02:45:39 +04:00
|
|
|
# Copyright (C) 2006-2014 Jean-Philippe Lang
|
2010-04-12 21:43:01 +04:00
|
|
|
#
|
|
|
|
# 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.
|
2011-08-31 20:03:15 +04:00
|
|
|
#
|
2010-04-12 21:43:01 +04:00
|
|
|
# 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.
|
2011-08-31 20:03:15 +04:00
|
|
|
#
|
2010-04-12 21:43:01 +04:00
|
|
|
# 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.
|
|
|
|
|
2010-12-13 02:24:34 +03:00
|
|
|
require File.expand_path('../../test_helper', __FILE__)
|
2010-04-12 21:43:01 +04:00
|
|
|
require 'issues_controller'
|
|
|
|
|
|
|
|
class IssuesControllerTransactionTest < ActionController::TestCase
|
2012-12-04 02:23:23 +04:00
|
|
|
tests IssuesController
|
2010-04-12 21:43:01 +04:00
|
|
|
fixtures :projects,
|
|
|
|
:users,
|
|
|
|
:roles,
|
|
|
|
:members,
|
|
|
|
:member_roles,
|
|
|
|
:issues,
|
|
|
|
:issue_statuses,
|
|
|
|
:versions,
|
|
|
|
:trackers,
|
|
|
|
:projects_trackers,
|
|
|
|
:issue_categories,
|
|
|
|
:enabled_modules,
|
|
|
|
:enumerations,
|
|
|
|
:attachments,
|
|
|
|
:workflows,
|
|
|
|
:custom_fields,
|
|
|
|
:custom_values,
|
|
|
|
:custom_fields_projects,
|
|
|
|
:custom_fields_trackers,
|
|
|
|
:time_entries,
|
|
|
|
:journals,
|
|
|
|
:journal_details,
|
|
|
|
:queries
|
|
|
|
|
|
|
|
self.use_transactional_fixtures = false
|
2011-08-31 20:03:15 +04:00
|
|
|
|
2010-04-12 21:43:01 +04:00
|
|
|
def setup
|
|
|
|
User.current = nil
|
|
|
|
end
|
2011-08-31 20:03:15 +04:00
|
|
|
|
2012-02-04 21:36:15 +04:00
|
|
|
def test_update_stale_issue_should_not_update_the_issue
|
2010-04-12 21:43:01 +04:00
|
|
|
issue = Issue.find(2)
|
|
|
|
@request.session[:user_id] = 2
|
|
|
|
|
|
|
|
assert_no_difference 'Journal.count' do
|
|
|
|
assert_no_difference 'TimeEntry.count' do
|
2012-02-17 01:00:11 +04:00
|
|
|
put :update,
|
|
|
|
:id => issue.id,
|
|
|
|
:issue => {
|
|
|
|
:fixed_version_id => 4,
|
2012-10-04 01:36:19 +04:00
|
|
|
:notes => 'My notes',
|
2012-02-17 01:00:11 +04:00
|
|
|
:lock_version => (issue.lock_version - 1)
|
|
|
|
},
|
|
|
|
:time_entry => { :hours => '2.5', :comments => '', :activity_id => TimeEntryActivity.first.id }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
assert_response :success
|
|
|
|
assert_template 'edit'
|
2012-07-07 09:23:52 +04:00
|
|
|
|
|
|
|
assert_select 'div.conflict'
|
|
|
|
assert_select 'input[name=?][value=?]', 'conflict_resolution', 'overwrite'
|
|
|
|
assert_select 'input[name=?][value=?]', 'conflict_resolution', 'add_notes'
|
|
|
|
assert_select 'label' do
|
|
|
|
assert_select 'input[name=?][value=?]', 'conflict_resolution', 'cancel'
|
|
|
|
assert_select 'a[href=/issues/2]'
|
|
|
|
end
|
2012-02-17 01:00:11 +04:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_update_stale_issue_should_save_attachments
|
|
|
|
set_tmp_attachments_directory
|
|
|
|
issue = Issue.find(2)
|
|
|
|
@request.session[:user_id] = 2
|
|
|
|
|
|
|
|
assert_no_difference 'Journal.count' do
|
|
|
|
assert_no_difference 'TimeEntry.count' do
|
|
|
|
assert_difference 'Attachment.count' do
|
2010-04-12 21:43:01 +04:00
|
|
|
put :update,
|
|
|
|
:id => issue.id,
|
|
|
|
:issue => {
|
|
|
|
:fixed_version_id => 4,
|
2012-10-04 01:36:19 +04:00
|
|
|
:notes => 'My notes',
|
2010-04-12 21:43:01 +04:00
|
|
|
:lock_version => (issue.lock_version - 1)
|
|
|
|
},
|
|
|
|
:attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}},
|
2010-04-30 14:06:51 +04:00
|
|
|
:time_entry => { :hours => '2.5', :comments => '', :activity_id => TimeEntryActivity.first.id }
|
2010-04-12 21:43:01 +04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2011-08-31 20:03:15 +04:00
|
|
|
|
2010-04-12 21:43:01 +04:00
|
|
|
assert_response :success
|
|
|
|
assert_template 'edit'
|
2014-01-11 14:12:49 +04:00
|
|
|
attachment = Attachment.order('id DESC').first
|
2012-02-17 01:00:11 +04:00
|
|
|
assert_tag 'input', :attributes => {:name => 'attachments[p0][token]', :value => attachment.token}
|
2012-12-11 00:09:41 +04:00
|
|
|
assert_tag 'input', :attributes => {:name => 'attachments[p0][filename]', :value => 'testfile.txt'}
|
2012-02-04 21:36:15 +04:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_update_stale_issue_without_notes_should_not_show_add_notes_option
|
|
|
|
issue = Issue.find(2)
|
|
|
|
@request.session[:user_id] = 2
|
|
|
|
|
|
|
|
put :update, :id => issue.id,
|
|
|
|
:issue => {
|
|
|
|
:fixed_version_id => 4,
|
2012-10-04 01:36:19 +04:00
|
|
|
:notes => '',
|
2012-02-04 21:36:15 +04:00
|
|
|
:lock_version => (issue.lock_version - 1)
|
2012-10-04 01:36:19 +04:00
|
|
|
}
|
2012-02-04 21:36:15 +04:00
|
|
|
|
|
|
|
assert_tag 'div', :attributes => {:class => 'conflict'}
|
|
|
|
assert_tag 'input', :attributes => {:name => 'conflict_resolution', :value => 'overwrite'}
|
|
|
|
assert_no_tag 'input', :attributes => {:name => 'conflict_resolution', :value => 'add_notes'}
|
|
|
|
assert_tag 'input', :attributes => {:name => 'conflict_resolution', :value => 'cancel'}
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_update_stale_issue_should_show_conflicting_journals
|
|
|
|
@request.session[:user_id] = 2
|
|
|
|
|
|
|
|
put :update, :id => 1,
|
|
|
|
:issue => {
|
|
|
|
:fixed_version_id => 4,
|
2012-10-04 01:36:19 +04:00
|
|
|
:notes => '',
|
2012-02-04 21:36:15 +04:00
|
|
|
:lock_version => 2
|
|
|
|
},
|
|
|
|
:last_journal_id => 1
|
|
|
|
|
|
|
|
assert_not_nil assigns(:conflict_journals)
|
|
|
|
assert_equal 1, assigns(:conflict_journals).size
|
|
|
|
assert_equal 2, assigns(:conflict_journals).first.id
|
|
|
|
assert_tag 'div', :attributes => {:class => 'conflict'},
|
|
|
|
:descendant => {:content => /Some notes with Redmine links/}
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_update_stale_issue_without_previous_journal_should_show_all_journals
|
|
|
|
@request.session[:user_id] = 2
|
|
|
|
|
|
|
|
put :update, :id => 1,
|
|
|
|
:issue => {
|
|
|
|
:fixed_version_id => 4,
|
2012-10-04 01:36:19 +04:00
|
|
|
:notes => '',
|
2012-02-04 21:36:15 +04:00
|
|
|
:lock_version => 2
|
|
|
|
},
|
|
|
|
:last_journal_id => ''
|
|
|
|
|
|
|
|
assert_not_nil assigns(:conflict_journals)
|
|
|
|
assert_equal 2, assigns(:conflict_journals).size
|
|
|
|
assert_tag 'div', :attributes => {:class => 'conflict'},
|
|
|
|
:descendant => {:content => /Some notes with Redmine links/}
|
|
|
|
assert_tag 'div', :attributes => {:class => 'conflict'},
|
|
|
|
:descendant => {:content => /Journal notes/}
|
|
|
|
end
|
|
|
|
|
2012-10-04 01:36:19 +04:00
|
|
|
def test_update_stale_issue_should_show_private_journals_with_permission_only
|
|
|
|
journal = Journal.create!(:journalized => Issue.find(1), :notes => 'Privates notes', :private_notes => true, :user_id => 1)
|
|
|
|
|
|
|
|
@request.session[:user_id] = 2
|
|
|
|
put :update, :id => 1, :issue => {:fixed_version_id => 4, :lock_version => 2}, :last_journal_id => ''
|
|
|
|
assert_include journal, assigns(:conflict_journals)
|
|
|
|
|
|
|
|
Role.find(1).remove_permission! :view_private_notes
|
|
|
|
put :update, :id => 1, :issue => {:fixed_version_id => 4, :lock_version => 2}, :last_journal_id => ''
|
|
|
|
assert_not_include journal, assigns(:conflict_journals)
|
|
|
|
end
|
|
|
|
|
2012-02-04 21:36:15 +04:00
|
|
|
def test_update_stale_issue_with_overwrite_conflict_resolution_should_update
|
|
|
|
@request.session[:user_id] = 2
|
|
|
|
|
|
|
|
assert_difference 'Journal.count' do
|
|
|
|
put :update, :id => 1,
|
|
|
|
:issue => {
|
|
|
|
:fixed_version_id => 4,
|
2012-10-04 01:36:19 +04:00
|
|
|
:notes => 'overwrite_conflict_resolution',
|
2012-02-04 21:36:15 +04:00
|
|
|
:lock_version => 2
|
|
|
|
},
|
|
|
|
:conflict_resolution => 'overwrite'
|
|
|
|
end
|
|
|
|
|
|
|
|
assert_response 302
|
|
|
|
issue = Issue.find(1)
|
|
|
|
assert_equal 4, issue.fixed_version_id
|
2014-01-11 14:12:49 +04:00
|
|
|
journal = Journal.order('id DESC').first
|
2012-02-04 21:36:15 +04:00
|
|
|
assert_equal 'overwrite_conflict_resolution', journal.notes
|
|
|
|
assert journal.details.any?
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_update_stale_issue_with_add_notes_conflict_resolution_should_update
|
|
|
|
@request.session[:user_id] = 2
|
|
|
|
|
|
|
|
assert_difference 'Journal.count' do
|
|
|
|
put :update, :id => 1,
|
|
|
|
:issue => {
|
|
|
|
:fixed_version_id => 4,
|
2012-10-04 01:36:19 +04:00
|
|
|
:notes => 'add_notes_conflict_resolution',
|
2012-02-04 21:36:15 +04:00
|
|
|
:lock_version => 2
|
|
|
|
},
|
|
|
|
:conflict_resolution => 'add_notes'
|
|
|
|
end
|
|
|
|
|
|
|
|
assert_response 302
|
|
|
|
issue = Issue.find(1)
|
|
|
|
assert_nil issue.fixed_version_id
|
2014-01-11 14:12:49 +04:00
|
|
|
journal = Journal.order('id DESC').first
|
2012-02-04 21:36:15 +04:00
|
|
|
assert_equal 'add_notes_conflict_resolution', journal.notes
|
|
|
|
assert journal.details.empty?
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_update_stale_issue_with_cancel_conflict_resolution_should_redirect_without_updating
|
|
|
|
@request.session[:user_id] = 2
|
|
|
|
|
|
|
|
assert_no_difference 'Journal.count' do
|
|
|
|
put :update, :id => 1,
|
|
|
|
:issue => {
|
|
|
|
:fixed_version_id => 4,
|
2012-10-04 01:36:19 +04:00
|
|
|
:notes => 'add_notes_conflict_resolution',
|
2012-02-04 21:36:15 +04:00
|
|
|
:lock_version => 2
|
|
|
|
},
|
|
|
|
:conflict_resolution => 'cancel'
|
|
|
|
end
|
|
|
|
|
|
|
|
assert_redirected_to '/issues/1'
|
|
|
|
issue = Issue.find(1)
|
|
|
|
assert_nil issue.fixed_version_id
|
2010-04-12 21:43:01 +04:00
|
|
|
end
|
2011-12-04 23:20:22 +04:00
|
|
|
|
2012-10-13 12:03:19 +04:00
|
|
|
def test_put_update_with_spent_time_and_failure_should_not_add_spent_time
|
|
|
|
@request.session[:user_id] = 2
|
|
|
|
|
|
|
|
assert_no_difference('TimeEntry.count') do
|
|
|
|
put :update,
|
|
|
|
:id => 1,
|
|
|
|
:issue => { :subject => '' },
|
|
|
|
:time_entry => { :hours => '2.5', :comments => 'should not be added', :activity_id => TimeEntryActivity.first.id }
|
|
|
|
assert_response :success
|
|
|
|
end
|
|
|
|
|
|
|
|
assert_select 'input[name=?][value=?]', 'time_entry[hours]', '2.5'
|
|
|
|
assert_select 'input[name=?][value=?]', 'time_entry[comments]', 'should not be added'
|
|
|
|
assert_select 'select[name=?]', 'time_entry[activity_id]' do
|
|
|
|
assert_select 'option[value=?][selected=selected]', TimeEntryActivity.first.id
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2011-12-04 23:20:22 +04:00
|
|
|
def test_index_should_rescue_invalid_sql_query
|
2012-12-09 18:10:49 +04:00
|
|
|
IssueQuery.any_instance.stubs(:statement).returns("INVALID STATEMENT")
|
2011-12-04 23:20:22 +04:00
|
|
|
|
|
|
|
get :index
|
|
|
|
assert_response 500
|
|
|
|
assert_tag 'p', :content => /An error occurred/
|
|
|
|
assert_nil session[:query]
|
|
|
|
assert_nil session[:issues_index_sort]
|
|
|
|
end
|
2010-04-12 21:43:01 +04:00
|
|
|
end
|