comparison test/functional/issues_controller_transaction_test.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch
author Chris Cannam
date Tue, 09 Sep 2014 09:29:00 +0100
parents e248c7af89ec
children
comparison
equal deleted inserted replaced
1516:b450a9d58aed 1517:dffacf8a6908
100 end 100 end
101 end 101 end
102 102
103 assert_response :success 103 assert_response :success
104 assert_template 'edit' 104 assert_template 'edit'
105 attachment = Attachment.first(:order => 'id DESC') 105 attachment = Attachment.order('id DESC').first
106 assert_tag 'input', :attributes => {:name => 'attachments[p0][token]', :value => attachment.token} 106 assert_tag 'input', :attributes => {:name => 'attachments[p0][token]', :value => attachment.token}
107 assert_tag 'input', :attributes => {:name => 'attachments[p0][filename]', :value => 'testfile.txt'} 107 assert_tag 'input', :attributes => {:name => 'attachments[p0][filename]', :value => 'testfile.txt'}
108 end 108 end
109 109
110 def test_update_stale_issue_without_notes_should_not_show_add_notes_option 110 def test_update_stale_issue_without_notes_should_not_show_add_notes_option
187 end 187 end
188 188
189 assert_response 302 189 assert_response 302
190 issue = Issue.find(1) 190 issue = Issue.find(1)
191 assert_equal 4, issue.fixed_version_id 191 assert_equal 4, issue.fixed_version_id
192 journal = Journal.first(:order => 'id DESC') 192 journal = Journal.order('id DESC').first
193 assert_equal 'overwrite_conflict_resolution', journal.notes 193 assert_equal 'overwrite_conflict_resolution', journal.notes
194 assert journal.details.any? 194 assert journal.details.any?
195 end 195 end
196 196
197 def test_update_stale_issue_with_add_notes_conflict_resolution_should_update 197 def test_update_stale_issue_with_add_notes_conflict_resolution_should_update
208 end 208 end
209 209
210 assert_response 302 210 assert_response 302
211 issue = Issue.find(1) 211 issue = Issue.find(1)
212 assert_nil issue.fixed_version_id 212 assert_nil issue.fixed_version_id
213 journal = Journal.first(:order => 'id DESC') 213 journal = Journal.order('id DESC').first
214 assert_equal 'add_notes_conflict_resolution', journal.notes 214 assert_equal 'add_notes_conflict_resolution', journal.notes
215 assert journal.details.empty? 215 assert journal.details.empty?
216 end 216 end
217 217
218 def test_update_stale_issue_with_cancel_conflict_resolution_should_redirect_without_updating 218 def test_update_stale_issue_with_cancel_conflict_resolution_should_redirect_without_updating