Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 37 deletions

diff --git a/spec/models/merge_request/approval_removal_settings_spec.rb b/spec/models/merge_request/approval_removal_settings_spec.rb
index e84fd403a55..5f879207a72 100644
--- a/spec/models/merge_request/approval_removal_settings_spec.rb
+++ b/spec/models/merge_request/approval_removal_settings_spec.rb
@@ -4,8 +4,8 @@ require 'spec_helper'
 
 RSpec.describe MergeRequest::ApprovalRemovalSettings do
   describe 'validations' do
-    let(:reset_approvals_on_push) { }
-    let(:selective_code_owner_removals) { }
+    let(:reset_approvals_on_push) {}
+    let(:selective_code_owner_removals) {}
 
     subject { described_class.new(project, reset_approvals_on_push, selective_code_owner_removals) }
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 945f3049282..69cd51137b5 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -5126,7 +5126,6 @@ RSpec.describe User do
 
       expect(cache_mock).to receive(:delete).with(['users', user.id, 'assigned_open_merge_requests_count'])
       expect(cache_mock).to receive(:delete).with(['users', user.id, 'review_requested_open_merge_requests_count'])
-      expect(cache_mock).to receive(:delete).with(['users', user.id, 'attention_requested_open_merge_requests_count'])
 
       allow(Rails).to receive(:cache).and_return(cache_mock)
 
@@ -5134,20 +5133,6 @@ RSpec.describe User do
     end
   end
 
-  describe '#invalidate_attention_requested_count' do
-    let(:user) { build_stubbed(:user) }
-
-    it 'invalidates cache for issue counter' do
-      cache_mock = double
-
-      expect(cache_mock).to receive(:delete).with(['users', user.id, 'attention_requested_open_merge_requests_count'])
-
-      allow(Rails).to receive(:cache).and_return(cache_mock)
-
-      user.invalidate_attention_requested_count
-    end
-  end
-
   describe '#invalidate_personal_projects_count' do
     let(:user) { build_stubbed(:user) }
 
@@ -5234,26 +5219,6 @@ RSpec.describe User do
     end
   end
 
-  describe '#attention_requested_open_merge_requests_count' do
-    let(:user) { create(:user) }
-    let(:project) { create(:project, :public) }
-    let(:archived_project) { create(:project, :public, :archived) }
-
-    before do
-      mr1 = create(:merge_request, source_project: project, author: user, reviewers: [user])
-      mr2 = create(:merge_request, :closed, source_project: project, author: user, reviewers: [user])
-      mr3 = create(:merge_request, source_project: archived_project, author: user, reviewers: [user])
-
-      mr1.find_reviewer(user).update!(state: :attention_requested)
-      mr2.find_reviewer(user).update!(state: :attention_requested)
-      mr3.find_reviewer(user).update!(state: :attention_requested)
-    end
-
-    it 'returns number of open merge requests from non-archived projects' do
-      expect(user.attention_requested_open_merge_requests_count(force: true)).to eq 1
-    end
-  end
-
   describe '#assigned_open_issues_count' do
     it 'returns number of open issues from non-archived projects' do
       user    = create(:user)