From 48afc0b15116d0ce47f12996b8d832f3c5f19427 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 20 Dec 2015 10:11:07 +0000 Subject: Private note flag disappears in issue update conflict (#21551). git-svn-id: http://svn.redmine.org/redmine/trunk@14984 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../issues_controller_transaction_test.rb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'test') diff --git a/test/functional/issues_controller_transaction_test.rb b/test/functional/issues_controller_transaction_test.rb index b38b09641..603b44a12 100644 --- a/test/functional/issues_controller_transaction_test.rb +++ b/test/functional/issues_controller_transaction_test.rb @@ -210,6 +210,27 @@ class IssuesControllerTransactionTest < ActionController::TestCase assert_nil issue.fixed_version_id journal = Journal.order('id DESC').first assert_equal 'add_notes_conflict_resolution', journal.notes + assert_equal false, journal.private_notes + assert journal.details.empty? + end + + def test_update_stale_issue_with_add_notes_conflict_resolution_should_preserve_private_notes + @request.session[:user_id] = 2 + + journal = new_record(Journal) do + put :update, :id => 1, + :issue => { + :fixed_version_id => 4, + :notes => 'add_privates_notes_conflict_resolution', + :private_notes => '1', + :lock_version => 2 + }, + :conflict_resolution => 'add_notes' + end + + assert_response 302 + assert_equal 'add_privates_notes_conflict_resolution', journal.notes + assert_equal true, journal.private_notes assert journal.details.empty? end -- cgit v1.2.3