annotate .svn/pristine/81/811e15b10c1d535d0efcbbe3eae1a7e4e38e4be1.svn-base @ 1519:afce8026aaeb redmine-2.4-integration

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