Issue_status_changed email added

Alex Denisov
1 parent 8da05a4f
Showing 3 changed files with 47 additions and 0 deletions Show diff stats
app/mailers/notify.rb
app/views/notify/issue_status_changed_email.html.haml
spec/mailers/notify_spec.rb
@@ -83,6 +83,14 @@ class Notify &lt; ActionMailer::Base
          subject: subject("access to project was granted"))
   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
  
   # Look up a User by their ID and return their email address
@@ -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}/
           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
  
       context 'for merge requests' do
...	...	@@ -83,6 +83,14 @@ class Notify < ActionMailer::Base
83	83	subject: subject("access to project was granted"))
84	84	end
85	85
	86	+ def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
	87	+ @issue = Issue.find issue_id
	88	+ @issue_status = status
	89	+ @updated_by = User.find updated_by_user_id
	90	+ mail(to: recipient(recipient_id),
	91	+ subject: subject("changed issue ##{@issue.id}", @issue.title))
	92	+ end
	93	+
86	94	private
87	95
88	96	# Look up a User by their ID and return their email address
...	...
...	...	@@ -0,0 +1,16 @@
	1	+%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
	2	+ %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
	3	+ %tr
	4	+ %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
	5	+ %td{align: "left", style: "padding: 20px 0 0;"}
	6	+ %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
	7	+ = "Issue was #{@issue_status} by #{@updated_by.name}"
	8	+ %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
	9	+ %tr
	10	+ %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
	11	+ %td{align: "left", style: "padding: 20px 0 0;"}
	12	+ %h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
	13	+ = "Issue ##{@issue.id}"
	14	+ = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
	15	+ %br
	16	+
...	...
...	...	@@ -91,6 +91,29 @@ describe Notify do
91	91	should have_body_text /#{project_issue_path project, issue}/
92	92	end
93	93	end
	94	+
	95	+ describe 'status changed' do
	96	+ let(:current_user) { Factory.create :user, email: "current@email.com" }
	97	+ let(:status) { 'closed' }
	98	+ subject { Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) }
	99	+
	100	+ it 'has the correct subject' do
	101	+ should have_subject /changed issue ##{issue.id} \\| #{issue.title}/i
	102	+ end
	103	+
	104	+ it 'contains the new status' do
	105	+ should have_body_text /#{status}/i
	106	+ end
	107	+
	108	+ it 'contains the user name' do
	109	+ should have_body_text /#{current_user.name}/i
	110	+ end
	111	+
	112	+ it 'contains a link to the issue' do
	113	+ should have_body_text /#{project_issue_path project, issue}/
	114	+ end
	115	+ end
	116	+
94	117	end
95	118
96	119	context 'for merge requests' do
...	...