Issue_status_changed email added
This commit is contained in:
parent
8da05a4ff7
commit
4d65532158
|
@ -83,6 +83,14 @@ class Notify < ActionMailer::Base
|
||||||
subject: subject("access to project was granted"))
|
subject: subject("access to project was granted"))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
|
||||||
|
@issue = Issue.find issue_id
|
||||||
|
@issue_status = status
|
||||||
|
@updated_by = User.find updated_by_user_id
|
||||||
|
mail(to: recipient(recipient_id),
|
||||||
|
subject: subject("changed issue ##{@issue.id}", @issue.title))
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
# Look up a User by their ID and return their email address
|
# Look up a User by their ID and return their email address
|
||||||
|
|
16
app/views/notify/issue_status_changed_email.html.haml
Normal file
16
app/views/notify/issue_status_changed_email.html.haml
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
|
||||||
|
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
|
||||||
|
%tr
|
||||||
|
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
|
||||||
|
%td{align: "left", style: "padding: 20px 0 0;"}
|
||||||
|
%h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
|
||||||
|
= "Issue was #{@issue_status} by #{@updated_by.name}"
|
||||||
|
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
|
||||||
|
%tr
|
||||||
|
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
|
||||||
|
%td{align: "left", style: "padding: 20px 0 0;"}
|
||||||
|
%h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
|
||||||
|
= "Issue ##{@issue.id}"
|
||||||
|
= link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
|
||||||
|
%br
|
||||||
|
|
|
@ -91,6 +91,29 @@ describe Notify do
|
||||||
should have_body_text /#{project_issue_path project, issue}/
|
should have_body_text /#{project_issue_path project, issue}/
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'status changed' do
|
||||||
|
let(:current_user) { Factory.create :user, email: "current@email.com" }
|
||||||
|
let(:status) { 'closed' }
|
||||||
|
subject { Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) }
|
||||||
|
|
||||||
|
it 'has the correct subject' do
|
||||||
|
should have_subject /changed issue ##{issue.id} \| #{issue.title}/i
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'contains the new status' do
|
||||||
|
should have_body_text /#{status}/i
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'contains the user name' do
|
||||||
|
should have_body_text /#{current_user.name}/i
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'contains a link to the issue' do
|
||||||
|
should have_body_text /#{project_issue_path project, issue}/
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'for merge requests' do
|
context 'for merge requests' do
|
||||||
|
|
Loading…
Reference in a new issue