Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-22 07:23:07 +01:00
Code Issues Packages Projects Releases Activity

Merged r14164 (#19538).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14199 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-04-25 07:20:44 +00:00
parent d904292635
commit 737cbcc2e9
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/changeset.rb
View File

@@ -242,8 +242,11 @@ class Changeset < ActiveRecord::Base
end
Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
{ :changeset => self, :issue => issue, :action => action })
unless issue.save
logger.warn("Issue ##{issue.id} could not be saved by changeset #{id}: #{issue.errors.full_messages}") if logger
if issue.changes.any?
unless issue.save
logger.warn("Issue ##{issue.id} could not be saved by changeset #{id}: #{issue.errors.full_messages}") if logger
end
end
issue
end

24
test/unit/changeset_test.rb
View File

@@ -163,6 +163,30 @@ class ChangesetTest < ActiveSupport::TestCase
assert_equal [1,2,3], c.issue_ids.sort
end
def test_update_keywords_with_changes_should_create_journal
issue = Issue.generate!(:project_id => 1, :status_id => 1)
with_settings :commit_update_keywords => [{'keywords' => 'fixes', 'status_id' => '3'}] do
assert_difference 'Journal.count' do
c = Changeset.generate!(:repository => Project.find(1).repository,:comments => "Fixes ##{issue.id}")
assert_include c.id, issue.reload.changeset_ids
journal = Journal.order('id DESC').first
assert_equal 1, journal.details.count
end
end
end
def test_update_keywords_without_change_should_not_create_journal
issue = Issue.generate!(:project_id => 1, :status_id => 3)
with_settings :commit_update_keywords => [{'keywords' => 'fixes', 'status_id' => '3'}] do
assert_no_difference 'Journal.count' do
c = Changeset.generate!(:repository => Project.find(1).repository,:comments => "Fixes ##{issue.id}")
assert_include c.id, issue.reload.changeset_ids
end
end
end
def test_update_keywords_with_multiple_rules
with_settings :commit_update_keywords => [
{'keywords' => 'fixes, closes', 'status_id' => '5'},