annotate .svn/pristine/c5/c579e1089533be72e96be9f837601901aa22b4de.svn-base @ 1494:e248c7af89ec redmine-2.4

Update to Redmine SVN revision 12979 on 2.4-stable branch
author Chris Cannam
date Mon, 17 Mar 2014 08:54:02 +0000
parents 261b3d9a4903
children
rev   line source
Chris@1464 1 # Redmine - project management software
Chris@1464 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
Chris@1464 3 #
Chris@1464 4 # This program is free software; you can redistribute it and/or
Chris@1464 5 # modify it under the terms of the GNU General Public License
Chris@1464 6 # as published by the Free Software Foundation; either version 2
Chris@1464 7 # of the License, or (at your option) any later version.
Chris@1464 8 #
Chris@1464 9 # This program is distributed in the hope that it will be useful,
Chris@1464 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@1464 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Chris@1464 12 # GNU General Public License for more details.
Chris@1464 13 #
Chris@1464 14 # You should have received a copy of the GNU General Public License
Chris@1464 15 # along with this program; if not, write to the Free Software
Chris@1464 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Chris@1464 17
Chris@1464 18 require File.expand_path('../../test_helper', __FILE__)
Chris@1464 19 require 'issues_controller'
Chris@1464 20
Chris@1464 21 class IssuesControllerTransactionTest < ActionController::TestCase
Chris@1464 22 tests IssuesController
Chris@1464 23 fixtures :projects,
Chris@1464 24 :users,
Chris@1464 25 :roles,
Chris@1464 26 :members,
Chris@1464 27 :member_roles,
Chris@1464 28 :issues,
Chris@1464 29 :issue_statuses,
Chris@1464 30 :versions,
Chris@1464 31 :trackers,
Chris@1464 32 :projects_trackers,
Chris@1464 33 :issue_categories,
Chris@1464 34 :enabled_modules,
Chris@1464 35 :enumerations,
Chris@1464 36 :attachments,
Chris@1464 37 :workflows,
Chris@1464 38 :custom_fields,
Chris@1464 39 :custom_values,
Chris@1464 40 :custom_fields_projects,
Chris@1464 41 :custom_fields_trackers,
Chris@1464 42 :time_entries,
Chris@1464 43 :journals,
Chris@1464 44 :journal_details,
Chris@1464 45 :queries
Chris@1464 46
Chris@1464 47 self.use_transactional_fixtures = false
Chris@1464 48
Chris@1464 49 def setup
Chris@1464 50 User.current = nil
Chris@1464 51 end
Chris@1464 52
Chris@1464 53 def test_update_stale_issue_should_not_update_the_issue
Chris@1464 54 issue = Issue.find(2)
Chris@1464 55 @request.session[:user_id] = 2
Chris@1464 56
Chris@1464 57 assert_no_difference 'Journal.count' do
Chris@1464 58 assert_no_difference 'TimeEntry.count' do
Chris@1464 59 put :update,
Chris@1464 60 :id => issue.id,
Chris@1464 61 :issue => {
Chris@1464 62 :fixed_version_id => 4,
Chris@1464 63 :notes => 'My notes',
Chris@1464 64 :lock_version => (issue.lock_version - 1)
Chris@1464 65 },
Chris@1464 66 :time_entry => { :hours => '2.5', :comments => '', :activity_id => TimeEntryActivity.first.id }
Chris@1464 67 end
Chris@1464 68 end
Chris@1464 69
Chris@1464 70 assert_response :success
Chris@1464 71 assert_template 'edit'
Chris@1464 72
Chris@1464 73 assert_select 'div.conflict'
Chris@1464 74 assert_select 'input[name=?][value=?]', 'conflict_resolution', 'overwrite'
Chris@1464 75 assert_select 'input[name=?][value=?]', 'conflict_resolution', 'add_notes'
Chris@1464 76 assert_select 'label' do
Chris@1464 77 assert_select 'input[name=?][value=?]', 'conflict_resolution', 'cancel'
Chris@1464 78 assert_select 'a[href=/issues/2]'
Chris@1464 79 end
Chris@1464 80 end
Chris@1464 81
Chris@1464 82 def test_update_stale_issue_should_save_attachments
Chris@1464 83 set_tmp_attachments_directory
Chris@1464 84 issue = Issue.find(2)
Chris@1464 85 @request.session[:user_id] = 2
Chris@1464 86
Chris@1464 87 assert_no_difference 'Journal.count' do
Chris@1464 88 assert_no_difference 'TimeEntry.count' do
Chris@1464 89 assert_difference 'Attachment.count' do
Chris@1464 90 put :update,
Chris@1464 91 :id => issue.id,
Chris@1464 92 :issue => {
Chris@1464 93 :fixed_version_id => 4,
Chris@1464 94 :notes => 'My notes',
Chris@1464 95 :lock_version => (issue.lock_version - 1)
Chris@1464 96 },
Chris@1464 97 :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}},
Chris@1464 98 :time_entry => { :hours => '2.5', :comments => '', :activity_id => TimeEntryActivity.first.id }
Chris@1464 99 end
Chris@1464 100 end
Chris@1464 101 end
Chris@1464 102
Chris@1464 103 assert_response :success
Chris@1464 104 assert_template 'edit'
Chris@1464 105 attachment = Attachment.first(:order => 'id DESC')
Chris@1464 106 assert_tag 'input', :attributes => {:name => 'attachments[p0][token]', :value => attachment.token}
Chris@1464 107 assert_tag 'input', :attributes => {:name => 'attachments[p0][filename]', :value => 'testfile.txt'}
Chris@1464 108 end
Chris@1464 109
Chris@1464 110 def test_update_stale_issue_without_notes_should_not_show_add_notes_option
Chris@1464 111 issue = Issue.find(2)
Chris@1464 112 @request.session[:user_id] = 2
Chris@1464 113
Chris@1464 114 put :update, :id => issue.id,
Chris@1464 115 :issue => {
Chris@1464 116 :fixed_version_id => 4,
Chris@1464 117 :notes => '',
Chris@1464 118 :lock_version => (issue.lock_version - 1)
Chris@1464 119 }
Chris@1464 120
Chris@1464 121 assert_tag 'div', :attributes => {:class => 'conflict'}
Chris@1464 122 assert_tag 'input', :attributes => {:name => 'conflict_resolution', :value => 'overwrite'}
Chris@1464 123 assert_no_tag 'input', :attributes => {:name => 'conflict_resolution', :value => 'add_notes'}
Chris@1464 124 assert_tag 'input', :attributes => {:name => 'conflict_resolution', :value => 'cancel'}
Chris@1464 125 end
Chris@1464 126
Chris@1464 127 def test_update_stale_issue_should_show_conflicting_journals
Chris@1464 128 @request.session[:user_id] = 2
Chris@1464 129
Chris@1464 130 put :update, :id => 1,
Chris@1464 131 :issue => {
Chris@1464 132 :fixed_version_id => 4,
Chris@1464 133 :notes => '',
Chris@1464 134 :lock_version => 2
Chris@1464 135 },
Chris@1464 136 :last_journal_id => 1
Chris@1464 137
Chris@1464 138 assert_not_nil assigns(:conflict_journals)
Chris@1464 139 assert_equal 1, assigns(:conflict_journals).size
Chris@1464 140 assert_equal 2, assigns(:conflict_journals).first.id
Chris@1464 141 assert_tag 'div', :attributes => {:class => 'conflict'},
Chris@1464 142 :descendant => {:content => /Some notes with Redmine links/}
Chris@1464 143 end
Chris@1464 144
Chris@1464 145 def test_update_stale_issue_without_previous_journal_should_show_all_journals
Chris@1464 146 @request.session[:user_id] = 2
Chris@1464 147
Chris@1464 148 put :update, :id => 1,
Chris@1464 149 :issue => {
Chris@1464 150 :fixed_version_id => 4,
Chris@1464 151 :notes => '',
Chris@1464 152 :lock_version => 2
Chris@1464 153 },
Chris@1464 154 :last_journal_id => ''
Chris@1464 155
Chris@1464 156 assert_not_nil assigns(:conflict_journals)
Chris@1464 157 assert_equal 2, assigns(:conflict_journals).size
Chris@1464 158 assert_tag 'div', :attributes => {:class => 'conflict'},
Chris@1464 159 :descendant => {:content => /Some notes with Redmine links/}
Chris@1464 160 assert_tag 'div', :attributes => {:class => 'conflict'},
Chris@1464 161 :descendant => {:content => /Journal notes/}
Chris@1464 162 end
Chris@1464 163
Chris@1464 164 def test_update_stale_issue_should_show_private_journals_with_permission_only
Chris@1464 165 journal = Journal.create!(:journalized => Issue.find(1), :notes => 'Privates notes', :private_notes => true, :user_id => 1)
Chris@1464 166
Chris@1464 167 @request.session[:user_id] = 2
Chris@1464 168 put :update, :id => 1, :issue => {:fixed_version_id => 4, :lock_version => 2}, :last_journal_id => ''
Chris@1464 169 assert_include journal, assigns(:conflict_journals)
Chris@1464 170
Chris@1464 171 Role.find(1).remove_permission! :view_private_notes
Chris@1464 172 put :update, :id => 1, :issue => {:fixed_version_id => 4, :lock_version => 2}, :last_journal_id => ''
Chris@1464 173 assert_not_include journal, assigns(:conflict_journals)
Chris@1464 174 end
Chris@1464 175
Chris@1464 176 def test_update_stale_issue_with_overwrite_conflict_resolution_should_update
Chris@1464 177 @request.session[:user_id] = 2
Chris@1464 178
Chris@1464 179 assert_difference 'Journal.count' do
Chris@1464 180 put :update, :id => 1,
Chris@1464 181 :issue => {
Chris@1464 182 :fixed_version_id => 4,
Chris@1464 183 :notes => 'overwrite_conflict_resolution',
Chris@1464 184 :lock_version => 2
Chris@1464 185 },
Chris@1464 186 :conflict_resolution => 'overwrite'
Chris@1464 187 end
Chris@1464 188
Chris@1464 189 assert_response 302
Chris@1464 190 issue = Issue.find(1)
Chris@1464 191 assert_equal 4, issue.fixed_version_id
Chris@1464 192 journal = Journal.first(:order => 'id DESC')
Chris@1464 193 assert_equal 'overwrite_conflict_resolution', journal.notes
Chris@1464 194 assert journal.details.any?
Chris@1464 195 end
Chris@1464 196
Chris@1464 197 def test_update_stale_issue_with_add_notes_conflict_resolution_should_update
Chris@1464 198 @request.session[:user_id] = 2
Chris@1464 199
Chris@1464 200 assert_difference 'Journal.count' do
Chris@1464 201 put :update, :id => 1,
Chris@1464 202 :issue => {
Chris@1464 203 :fixed_version_id => 4,
Chris@1464 204 :notes => 'add_notes_conflict_resolution',
Chris@1464 205 :lock_version => 2
Chris@1464 206 },
Chris@1464 207 :conflict_resolution => 'add_notes'
Chris@1464 208 end
Chris@1464 209
Chris@1464 210 assert_response 302
Chris@1464 211 issue = Issue.find(1)
Chris@1464 212 assert_nil issue.fixed_version_id
Chris@1464 213 journal = Journal.first(:order => 'id DESC')
Chris@1464 214 assert_equal 'add_notes_conflict_resolution', journal.notes
Chris@1464 215 assert journal.details.empty?
Chris@1464 216 end
Chris@1464 217
Chris@1464 218 def test_update_stale_issue_with_cancel_conflict_resolution_should_redirect_without_updating
Chris@1464 219 @request.session[:user_id] = 2
Chris@1464 220
Chris@1464 221 assert_no_difference 'Journal.count' do
Chris@1464 222 put :update, :id => 1,
Chris@1464 223 :issue => {
Chris@1464 224 :fixed_version_id => 4,
Chris@1464 225 :notes => 'add_notes_conflict_resolution',
Chris@1464 226 :lock_version => 2
Chris@1464 227 },
Chris@1464 228 :conflict_resolution => 'cancel'
Chris@1464 229 end
Chris@1464 230
Chris@1464 231 assert_redirected_to '/issues/1'
Chris@1464 232 issue = Issue.find(1)
Chris@1464 233 assert_nil issue.fixed_version_id
Chris@1464 234 end
Chris@1464 235
Chris@1464 236 def test_put_update_with_spent_time_and_failure_should_not_add_spent_time
Chris@1464 237 @request.session[:user_id] = 2
Chris@1464 238
Chris@1464 239 assert_no_difference('TimeEntry.count') do
Chris@1464 240 put :update,
Chris@1464 241 :id => 1,
Chris@1464 242 :issue => { :subject => '' },
Chris@1464 243 :time_entry => { :hours => '2.5', :comments => 'should not be added', :activity_id => TimeEntryActivity.first.id }
Chris@1464 244 assert_response :success
Chris@1464 245 end
Chris@1464 246
Chris@1464 247 assert_select 'input[name=?][value=?]', 'time_entry[hours]', '2.5'
Chris@1464 248 assert_select 'input[name=?][value=?]', 'time_entry[comments]', 'should not be added'
Chris@1464 249 assert_select 'select[name=?]', 'time_entry[activity_id]' do
Chris@1464 250 assert_select 'option[value=?][selected=selected]', TimeEntryActivity.first.id
Chris@1464 251 end
Chris@1464 252 end
Chris@1464 253
Chris@1464 254 def test_index_should_rescue_invalid_sql_query
Chris@1464 255 IssueQuery.any_instance.stubs(:statement).returns("INVALID STATEMENT")
Chris@1464 256
Chris@1464 257 get :index
Chris@1464 258 assert_response 500
Chris@1464 259 assert_tag 'p', :content => /An error occurred/
Chris@1464 260 assert_nil session[:query]
Chris@1464 261 assert_nil session[:issues_index_sort]
Chris@1464 262 end
Chris@1464 263 end