| @@ -1626,6 +1626,7 class Issue < ActiveRecord::Base | |||||
| 1626 | # Same user and notes |
|
1626 | # Same user and notes | |
| 1627 | if @current_journal |
|
1627 | if @current_journal | |
| 1628 | duplicate.init_journal(@current_journal.user, @current_journal.notes) |
|
1628 | duplicate.init_journal(@current_journal.user, @current_journal.notes) | |
|
|
1629 | duplicate.private_notes = @current_journal.private_notes | |||
| 1629 | end |
|
1630 | end | |
| 1630 | duplicate.update_attribute :status, self.status |
|
1631 | duplicate.update_attribute :status, self.status | |
| 1631 | end |
|
1632 | end | |
| @@ -1274,6 +1274,24 class IssueTest < ActiveSupport::TestCase | |||||
| 1274 | assert issue3.reload.closed? |
|
1274 | assert issue3.reload.closed? | |
| 1275 | end |
|
1275 | end | |
| 1276 |
|
1276 | |||
|
|
1277 | def test_should_close_duplicates_with_private_notes | |||
|
|
1278 | issue = Issue.generate! | |||
|
|
1279 | duplicate = Issue.generate! | |||
|
|
1280 | IssueRelation.create!(:issue_from => duplicate, :issue_to => issue, | |||
|
|
1281 | :relation_type => IssueRelation::TYPE_DUPLICATES) | |||
|
|
1282 | assert issue.reload.duplicates.include?(duplicate) | |||
|
|
1283 | ||||
|
|
1284 | # Closing issue with private notes | |||
|
|
1285 | issue.init_journal(User.first, "Private notes") | |||
|
|
1286 | issue.private_notes = true | |||
|
|
1287 | issue.status = IssueStatus.where(:is_closed => true).first | |||
|
|
1288 | assert_save issue | |||
|
|
1289 | ||||
|
|
1290 | duplicate.reload | |||
|
|
1291 | assert journal = duplicate.journals.detect {|journal| journal.notes == "Private notes"} | |||
|
|
1292 | assert_equal true, journal.private_notes | |||
|
|
1293 | end | |||
|
|
1294 | ||||
| 1277 | def test_should_not_close_duplicated_issue |
|
1295 | def test_should_not_close_duplicated_issue | |
| 1278 | issue1 = Issue.generate! |
|
1296 | issue1 = Issue.generate! | |
| 1279 | issue2 = Issue.generate! |
|
1297 | issue2 = Issue.generate! | |
General Comments 0
You need to be logged in to leave comments.
Login now