Send project transfer email to all members. Added specs for project move email

Dmitriy Zaporozhets
1 parent dc0f08f8
Showing 3 changed files with 24 additions and 6 deletions Show diff stats
app/mailers/emails/projects.rb
app/models/project.rb
spec/mailers/notify_spec.rb
@@ -8,10 +8,10 @@ module Emails
     end
  
  
-    def project_was_moved_email(user_project_id)
-      @users_project = UsersProject.find user_project_id
-      @project = @users_project.project
-      mail(to: @users_project.user.email,
+    def project_was_moved_email(project_id, user_id)
+      @user = User.find user_id
+      @project = Project.find project_id
+      mail(to: @user.email,
            subject: subject("project was moved"))
     end
   end
@@ -246,8 +246,8 @@ class Project &lt; ActiveRecord::Base
   end
  
   def send_move_instructions
-    self.users_projects.each do |member|
-      Notify.delay.project_was_moved_email(member.id)
+    team.members.each do |user|
+      Notify.delay.project_was_moved_email(self.id, user.id)
     end
   end
  
@@ -218,6 +218,24 @@ describe Notify do
       end
     end
  
+    describe 'project was moved' do
+      let(:project) { create(:project) }
+      let(:user) { create(:user) }
+      subject { Notify.project_was_moved_email(project.id, user.id) }
+
+      it 'has the correct subject' do
+        should have_subject /project was moved/
+      end
+
+      it 'contains name of project' do
+        should have_body_text /#{project.name_with_namespace}/
+      end
+
+      it 'contains new user role' do
+        should have_body_text /#{project.ssh_url_to_repo}/
+      end
+    end
+
     describe 'project access changed' do
       let(:project) { create(:project) }
       let(:user) { create(:user) }
...	...	@@ -8,10 +8,10 @@ module Emails
8	8	end
9	9
10	10
11		- def project_was_moved_email(user_project_id)
12		- @users_project = UsersProject.find user_project_id
13		- @project = @users_project.project
14		- mail(to: @users_project.user.email,
	11	+ def project_was_moved_email(project_id, user_id)
	12	+ @user = User.find user_id
	13	+ @project = Project.find project_id
	14	+ mail(to: @user.email,
15	15	subject: subject("project was moved"))
16	16	end
17	17	end
...	...
...	...	@@ -246,8 +246,8 @@ class Project < ActiveRecord::Base
246	246	end
247	247
248	248	def send_move_instructions
249		- self.users_projects.each do \|member\|
250		- Notify.delay.project_was_moved_email(member.id)
	249	+ team.members.each do \|user\|
	250	+ Notify.delay.project_was_moved_email(self.id, user.id)
251	251	end
252	252	end
253	253
...	...
...	...	@@ -218,6 +218,24 @@ describe Notify do
218	218	end
219	219	end
220	220
	221	+ describe 'project was moved' do
	222	+ let(:project) { create(:project) }
	223	+ let(:user) { create(:user) }
	224	+ subject { Notify.project_was_moved_email(project.id, user.id) }
	225	+
	226	+ it 'has the correct subject' do
	227	+ should have_subject /project was moved/
	228	+ end
	229	+
	230	+ it 'contains name of project' do
	231	+ should have_body_text /#{project.name_with_namespace}/
	232	+ end
	233	+
	234	+ it 'contains new user role' do
	235	+ should have_body_text /#{project.ssh_url_to_repo}/
	236	+ end
	237	+ end
	238	+
221	239	describe 'project access changed' do
222	240	let(:project) { create(:project) }
223	241	let(:user) { create(:user) }
...	...