Merge branch 'mr-origin-863' into 'master'

Resolve ""Send Email to Users" Feature does not respect blocked users"

See merge request !945

app/workers/admin_emails_worker.rb

@@ -3,7 +3,7 @@ class AdminEmailsWorker
   include DedicatedSidekiqQueue
 
   def perform(recipient_id, subject, body)
-    recipient_list(recipient_id).pluck(:id).each do |user_id|
+    recipient_list(recipient_id).pluck(:id).uniq.each do |user_id| 
       Notify.send_admin_notification(user_id, subject, body).deliver_later
     end
   end
@@ -13,11 +13,11 @@ class AdminEmailsWorker
   def recipient_list(recipient_id)
     case recipient_id
     when 'all'
-      User.subscribed_for_admin_email
+      User.active.subscribed_for_admin_email
     when /group-(\d+)\z/
-      Group.find($1).users.subscribed_for_admin_email
+      Group.find($1).users.merge(Member.active).subscribed_for_admin_email
     when /project-(\d+)\z/
-      Project.find($1).team.users.subscribed_for_admin_email
+      Project.find($1).team.users.references(:members).merge(Member.active).subscribed_for_admin_email
     end
   end
 end

changelogs/unreleased-ee/mr-origin-863.yml

+---
+title: Adds a check ensure only active, ie. non-blocked users can be emailed from
+  the admin panel
+merge_request: 
+author: 

spec/workers/admin_emails_worker_spec.rb

@@ -2,18 +2,39 @@ require 'spec_helper'
 
 describe AdminEmailsWorker do
   context "recipients" do
-    let(:recipient_id) { "group-#{group.id}" }
     let(:group) { create :group }
+    let(:project) { create :project }
 
     before do
       2.times do
-        group.add_user(create(:user), Gitlab::Access::DEVELOPER)
+        user = create(:user)
+        group.add_user(user, Gitlab::Access::DEVELOPER)
+        project.add_user(user, Gitlab::Access::DEVELOPER)
       end
       unsubscribed_user = create(:user, admin_email_unsubscribed_at: 5.days.ago)
       group.add_user(unsubscribed_user, Gitlab::Access::DEVELOPER)
+      project.add_user(unsubscribed_user, Gitlab::Access::DEVELOPER)
+      
+      blocked_user = create(:user, state: :blocked)
+      group.add_user(blocked_user, Gitlab::Access::DEVELOPER)
+      project.add_user(blocked_user, Gitlab::Access::DEVELOPER)
       ActionMailer::Base.deliveries = []
     end
 
+    context "sending emails to members of a group only" do
+      let(:recipient_id) { "group-#{group.id}" }
+
+      it "sends email to subscribed users" do
+        perform_enqueued_jobs do
+          AdminEmailsWorker.new.perform(recipient_id, 'subject', 'body')
+          expect(ActionMailer::Base.deliveries.count).to eql 2
+        end
+      end
+    end   
+
+    context "sending emails to members of a project only" do
+      let(:recipient_id) { "project-#{project.id}" }
+
       it "sends email to subscribed users" do
         perform_enqueued_jobs do
           AdminEmailsWorker.new.perform(recipient_id, 'subject', 'body')
@@ -21,4 +42,16 @@ describe AdminEmailsWorker do
         end
       end
     end   
+
+    context "sending emails to users directly" do
+      let(:recipient_id) { "all" }
+
+      it "sends email to subscribed users" do
+        perform_enqueued_jobs do
+          AdminEmailsWorker.new.perform(recipient_id, 'subject', 'body')
+          expect(ActionMailer::Base.deliveries.count).to eql 4
+        end
+      end
+    end   
+  end
 end