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

3 files changed, 24 insertions, 6 deletions

diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index dcd894bb8ef..1ad7ca588bd 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.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
diff --git a/app/models/project.rb b/app/models/project.rb
index f36385cf6b1..c1405a70b39 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -246,8 +246,8 @@ class Project < 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
 
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index d2e1e8a8743..7290e2b739d 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -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) }