Merge branch 'id-rename-has-approved-to-approved-byy' into 'master'

Rename has_approved? methods to approved_by?

See merge request gitlab-org/gitlab!37051

app/models/concerns/approvable_base.rb

@@ -8,7 +8,7 @@ module ApprovableBase
     has_many :approved_by_users, through: :approvals, source: :user
   end
 
-  def has_approved?(user)
+  def approved_by?(user)
     return false unless user
 
     approved_by_users.include?(user)

app/services/merge_requests/remove_approval_service.rb

@@ -4,7 +4,7 @@ module MergeRequests
   class RemoveApprovalService < MergeRequests::BaseService
     # rubocop: disable CodeReuse/ActiveRecord
     def execute(merge_request)
-      return unless merge_request.has_approved?(current_user)
+      return unless merge_request.approved_by?(current_user)
 
       # paranoid protection against running wrong deletes
       return unless merge_request.id && current_user.id

ee/app/controllers/ee/projects/merge_requests_controller.rb

@@ -45,7 +45,7 @@ module EE
       end
 
       def unapprove
-        if merge_request.has_approved?(current_user)
+        if merge_request.approved_by?(current_user)
           ::MergeRequests::RemoveApprovalService
             .new(project, current_user)
             .execute(merge_request)

ee/app/models/approval_state.rb

@@ -128,12 +128,6 @@ class ApprovalState
     true
   end
 
-  def has_approved?(user)
-    return false unless user
-
-    approved_approvers.include?(user)
-  end
-
   def authors_can_approve?
     project.merge_requests_author_approval?
   end

ee/app/models/concerns/approvable.rb

@@ -13,7 +13,6 @@ module Approvable
     approvals_left
     approvals_required
     can_approve?
-    has_approved?
     authors_can_approve?
     committers_can_approve?
     approvers_overwritten?

ee/app/views/projects/merge_requests/_approvals_count.html.haml

 - if merge_request.approval_needed?
 
   - approved = merge_request.approved?
-  - self_approved = merge_request.has_approved?(current_user)
+  - self_approved = merge_request.approved_by?(current_user)
   - given = merge_request.approvals_given
   - total = merge_request.total_approvals_count
 

ee/lib/ee/api/entities/approval_state.rb

@@ -51,7 +51,7 @@ module EE
         end
 
         expose :user_has_approved do |approval_state, options|
-          approval_state.has_approved?(options[:current_user])
+          approval_state.merge_request.approved_by?(options[:current_user])
         end
 
         expose :user_can_approve do |approval_state, options|

ee/spec/models/approval_state_spec.rb

@@ -744,7 +744,7 @@ RSpec.describe ApprovalState do
           end
 
           it 'requires 1 approval' do
-            expect(subject.has_approved?(approver)).to eq(true)
+            expect(merge_request.approved_by?(approver)).to eq(true)
             expect(subject.approvals_left).to eq(1)
           end
 
@@ -754,7 +754,7 @@ RSpec.describe ApprovalState do
             end
 
             it 'becomes approved' do
-              expect(subject.has_approved?(approver1)).to eq(true)
+              expect(merge_request.approved_by?(approver1)).to eq(true)
               expect(subject.approved?).to eq(true)
             end
           end
@@ -762,19 +762,6 @@ RSpec.describe ApprovalState do
       end
     end
 
-    describe '#has_approved?' do
-      it 'returns false if user is nil' do
-        expect(subject.has_approved?(nil)).to eq(false)
-      end
-
-      it 'returns true if user has approved' do
-        create(:approval, merge_request: merge_request, user: approver1)
-
-        expect(subject.has_approved?(approver1)).to eq(true)
-        expect(subject.has_approved?(approver2)).to eq(false)
-      end
-    end
-
     describe '#authors_can_approve?' do
       context 'when project allows author approval' do
         before do
@@ -1353,19 +1340,6 @@ RSpec.describe ApprovalState do
       end
     end
 
-    describe '#has_approved?' do
-      it 'returns false if user is nil' do
-        expect(subject.has_approved?(nil)).to eq(false)
-      end
-
-      it 'returns true if user has approved' do
-        create(:approval, merge_request: merge_request, user: approver1)
-
-        expect(subject.has_approved?(approver1)).to eq(true)
-        expect(subject.has_approved?(approver2)).to eq(false)
-      end
-    end
-
     describe '#authors_can_approve?' do
       context 'when project allows author approval' do
         before do

lib/api/entities/merge_request_approvals.rb

@@ -4,11 +4,11 @@ module API
   module Entities
     class MergeRequestApprovals < Grape::Entity
       expose :user_has_approved do |merge_request, options|
-        merge_request.has_approved?(options[:current_user])
+        merge_request.approved_by?(options[:current_user])
       end
 
       expose :user_can_approve do |merge_request, options|
-        !merge_request.has_approved?(options[:current_user]) &&
+        !merge_request.approved_by?(options[:current_user]) &&
           options[:current_user].can?(:approve_merge_request, merge_request)
       end
 

spec/models/concerns/approvable_base_spec.rb

@@ -3,11 +3,11 @@
 require 'spec_helper'
 
 RSpec.describe ApprovableBase do
-  describe '#has_approved?' do
+  describe '#approved_by?' do
     let(:merge_request) { create(:merge_request) }
     let(:user) { create(:user) }
 
-    subject { merge_request.has_approved?(user) }
+    subject { merge_request.approved_by?(user) }
 
     context 'when a user has not approved' do
       it 'returns false' do