| @@ -1587,6 +1587,7 class Issue < ActiveRecord::Base | |||||
| 1587 | # Same user and notes |
|
1587 | # Same user and notes | |
| 1588 | if @current_journal |
|
1588 | if @current_journal | |
| 1589 | duplicate.init_journal(@current_journal.user, @current_journal.notes) |
|
1589 | duplicate.init_journal(@current_journal.user, @current_journal.notes) | |
|
|
1590 | duplicate.private_notes = @current_journal.private_notes | |||
| 1590 | end |
|
1591 | end | |
| 1591 | duplicate.update_attribute :status, self.status |
|
1592 | duplicate.update_attribute :status, self.status | |
| 1592 | end |
|
1593 | end | |
| @@ -1226,6 +1226,24 class IssueTest < ActiveSupport::TestCase | |||||
| 1226 | assert issue3.reload.closed? |
|
1226 | assert issue3.reload.closed? | |
| 1227 | end |
|
1227 | end | |
| 1228 |
|
1228 | |||
|
|
1229 | def test_should_close_duplicates_with_private_notes | |||
|
|
1230 | issue = Issue.generate! | |||
|
|
1231 | duplicate = Issue.generate! | |||
|
|
1232 | IssueRelation.create!(:issue_from => duplicate, :issue_to => issue, | |||
|
|
1233 | :relation_type => IssueRelation::TYPE_DUPLICATES) | |||
|
|
1234 | assert issue.reload.duplicates.include?(duplicate) | |||
|
|
1235 | ||||
|
|
1236 | # Closing issue with private notes | |||
|
|
1237 | issue.init_journal(User.first, "Private notes") | |||
|
|
1238 | issue.private_notes = true | |||
|
|
1239 | issue.status = IssueStatus.where(:is_closed => true).first | |||
|
|
1240 | assert_save issue | |||
|
|
1241 | ||||
|
|
1242 | duplicate.reload | |||
|
|
1243 | assert journal = duplicate.journals.detect {|journal| journal.notes == "Private notes"} | |||
|
|
1244 | assert_equal true, journal.private_notes | |||
|
|
1245 | end | |||
|
|
1246 | ||||
| 1229 | def test_should_not_close_duplicated_issue |
|
1247 | def test_should_not_close_duplicated_issue | |
| 1230 | issue1 = Issue.generate! |
|
1248 | issue1 = Issue.generate! | |
| 1231 | issue2 = Issue.generate! |
|
1249 | issue2 = Issue.generate! | |
General Comments 0
You need to be logged in to leave comments.
Login now