summaryrefslogtreecommitdiffstats
path: root/test/functional
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-04-11 16:27:37 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-04-11 16:27:37 +0000
commit43e5bb75d21f4654414e025b4fd49803507eba3c (patch)
treea86e8032c7f2532a43ae1c31b92410f8cdee1dbe /test/functional
parent2674c6116cade13556cea62bb6e38567fd34cf10 (diff)
downloadredmine-43e5bb75d21f4654414e025b4fd49803507eba3c.tar.gz
redmine-43e5bb75d21f4654414e025b4fd49803507eba3c.zip
Fixed: issue optimistic locking broken by r3308 (#5280).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3663 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional')
-rw-r--r--test/functional/issues_controller_test.rb23
1 files changed, 23 insertions, 0 deletions
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 757f36c19..37561ec69 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -980,6 +980,29 @@ class IssuesControllerTest < ActionController::TestCase
assert_redirected_to :controller => 'issues', :action => 'show', :id => issue.id
end
+ def test_put_update_stale_issue
+ issue = Issue.find(2)
+ @request.session[:user_id] = 2
+
+ assert_no_difference 'Journal.count' do
+ assert_no_difference 'Attachment.count' do
+ put :update,
+ :id => issue.id,
+ :issue => {
+ :fixed_version_id => 4,
+ :lock_version => (issue.lock_version - 1)
+ },
+ :notes => '',
+ :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
+ end
+ end
+
+ assert_response :success
+ assert_template 'edit'
+ assert_tag :tag => 'div', :attributes => { :id => 'errorExplanation' },
+ :content => /Data has been updated by another user/
+ end
+
def test_get_bulk_edit
@request.session[:user_id] = 2
get :bulk_edit, :ids => [1, 2]