deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Protect IssueObserver#send_reassigned_email method.

Browse source
This commit is contained in:
Robb Kidd 2012-06-20 21:23:05 -04:00
parent 70c6b48ebc
commit 65989141dc
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/issue_observer.rb
View file

@ -11,6 +11,8 @@ class IssueObserver < ActiveRecord::Observer
Note.create_status_change_note(issue, current_user, 'reopened') if issue.is_being_reopened? Note.create_status_change_note(issue, current_user, 'reopened') if issue.is_being_reopened?
end end
protected
def send_reassigned_email(issue) def send_reassigned_email(issue)
recipient_ids = [issue.assignee_id, issue.assignee_id_was].keep_if {|id| id != current_user.id } recipient_ids = [issue.assignee_id, issue.assignee_id_was].keep_if {|id| id != current_user.id }

6
spec/models/issue_observer_spec.rb
View file

@ -121,7 +121,7 @@ describe IssueObserver do
it_sends_a_reassigned_email_to assignee.id it_sends_a_reassigned_email_to assignee.id
it_sends_a_reassigned_email_to previous_assignee.id it_sends_a_reassigned_email_to previous_assignee.id
subject.send_reassigned_email(issue) subject.send(:send_reassigned_email, issue)
end end
context 'does not send an email to the user who made the reassignment' do context 'does not send an email to the user who made the reassignment' do
@ -130,14 +130,14 @@ describe IssueObserver do
it_sends_a_reassigned_email_to previous_assignee.id it_sends_a_reassigned_email_to previous_assignee.id
it_does_not_send_a_reassigned_email_to assignee.id it_does_not_send_a_reassigned_email_to assignee.id
subject.send_reassigned_email(issue) subject.send(:send_reassigned_email, issue)
end end
it 'if the user is the previous assignee' do it 'if the user is the previous assignee' do
subject.stub(:current_user).and_return(previous_assignee) subject.stub(:current_user).and_return(previous_assignee)
it_sends_a_reassigned_email_to assignee.id it_sends_a_reassigned_email_to assignee.id
it_does_not_send_a_reassigned_email_to previous_assignee.id it_does_not_send_a_reassigned_email_to previous_assignee.id
subject.send_reassigned_email(issue) subject.send(:send_reassigned_email, issue)
end end
end end
end end