Port over fixes

From dev.gitlab repo

ee/spec/models/merge_request_spec.rb

@@ -536,8 +536,8 @@ describe MergeRequest do
     it "returns correct value" do
       user = create(:user)
       user1 = create(:user)
-      merge_request.approvers.create(user_id: user.id)
-      merge_request.approvers.create(user_id: user1.id)
+      create(:approver, target: merge_request, user: user)
+      create(:approver, target: merge_request, user: user1)
       merge_request.approvals.create(user_id: user1.id)
 
       expect(merge_request.approvers_left).to eq [user]
@@ -550,9 +550,9 @@ describe MergeRequest do
       group = create(:group)
 
       group.add_developer(user2)
-      merge_request.approver_groups.create(group: group)
-      merge_request.approvers.create(user_id: user.id)
-      merge_request.approvers.create(user_id: user1.id)
+      create(:approver_group, target: merge_request, group: group)
+      create(:approver, target: merge_request, user: user)
+      create(:approver, target: merge_request, user: user1)
       merge_request.approvals.create(user_id: user1.id)
 
       expect(merge_request.approvers_left).to match_array [user, user2]

ee/spec/services/ee/notification_service_spec.rb

@@ -543,6 +543,7 @@ describe EE::NotificationService, :mailer do
         before do
           merge_request.target_project.update(approvals_before_merge: 1)
           project_approvers.each { |approver| create(:approver, user: approver, target: merge_request.target_project) }
+          reset_delivered_emails!
         end
 
         it 'emails the approvers' do
@@ -563,6 +564,7 @@ describe EE::NotificationService, :mailer do
 
           before do
             mr_approvers.each { |approver| create(:approver, user: approver, target: merge_request) }
+            reset_delivered_emails!
           end
 
           it 'emails the MR approvers' do

ee/spec/services/merge_requests/update_service_spec.rb

@@ -124,6 +124,11 @@ describe MergeRequests::UpdateService, :mailer do
 
       before do
         stub_feature_flags(approval_rule: false)
+
+        project.add_developer(existing_approver)
+        project.add_developer(removed_approver)
+        project.add_developer(new_approver)
+
         perform_enqueued_jobs do
           update_merge_request(approver_ids: [existing_approver, removed_approver].map(&:id).join(','))
         end