Merge branch '353387-filter-commenters-by-user-note-authors' into 'master'

Filter commented_approvers for user note authors

See merge request gitlab-org/gitlab!81563

ee/app/models/approval_wrapped_any_approver_rule.rb

@@ -18,7 +18,7 @@ class ApprovalWrappedAnyApproverRule < ApprovalWrappedRule
 
   def commented_approvers
     strong_memoize(:commented_approvers) do
-      merge_request.note_authors.select do |user|
+      merge_request.user_note_authors.select do |user|
         merge_request.can_approve?(user)
       end
     end

ee/app/models/approval_wrapped_rule.rb

@@ -80,7 +80,7 @@ class ApprovalWrappedRule
 
   def commented_approvers
     strong_memoize(:commented_approvers) do
-      merge_request.note_authors & approvers
+      merge_request.user_note_authors & approvers
     end
   end
 

ee/spec/models/approval_wrapped_any_approver_rule_spec.rb

@@ -55,10 +55,12 @@ RSpec.describe ApprovalWrappedAnyApproverRule do
 
     it "returns an array of approvers who have commented" do
       create(:note, project: merge_request.project, noteable: merge_request, author: approver1)
+      create(:system_note, project: merge_request.project, noteable: merge_request, author: approver2)
 
-      allow(merge_request).to receive(:can_approve?).with(approver1).and_return(true)
+      allow(merge_request).to receive(:can_approve?).and_return(true)
 
-      expect(subject.commented_approvers).to eq([approver1])
+      expect(subject.commented_approvers).to include(approver1)
+      expect(subject.commented_approvers).not_to include(approver2)
     end
   end
 end

ee/spec/models/approval_wrapped_rule_spec.rb

@@ -162,9 +162,14 @@ RSpec.describe ApprovalWrappedRule do
     end
 
     it "returns an array of approvers who have commented" do
+      non_approver = create(:user)
       create(:note, project: merge_request.project, noteable: merge_request, author: approver1)
+      create(:note, project: merge_request.project, noteable: merge_request, author: non_approver)
+      create(:system_note, project: merge_request.project, noteable: merge_request, author: approver3)
 
-      expect(subject.commented_approvers).to eq([approver1])
+      expect(subject.commented_approvers).to include(approver1)
+      expect(subject.commented_approvers).not_to include(non_approver)
+      expect(subject.commented_approvers).not_to include(approver3)
     end
   end