Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

3 files changed, 30 insertions, 21 deletions

diff --git a/spec/lib/api/entities/merge_request_basic_spec.rb b/spec/lib/api/entities/merge_request_basic_spec.rb
index fe4c27b70ae..8572b067984 100644
--- a/spec/lib/api/entities/merge_request_basic_spec.rb
+++ b/spec/lib/api/entities/merge_request_basic_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe ::API::Entities::MergeRequestBasic do
   let_it_be(:project) { create(:project, :public) }
   let_it_be(:merge_request) { create(:merge_request) }
   let_it_be(:labels) { create_list(:label, 3) }
-  let_it_be(:merge_requests) { create_list(:labeled_merge_request, 10, :unique_branches, :with_diffs, labels: labels) }
+  let_it_be(:merge_requests) { create_list(:labeled_merge_request, 10, :unique_branches, labels: labels) }
 
   # This mimics the behavior of the `Grape::Entity` serializer
   def present(obj)
@@ -42,29 +42,14 @@ RSpec.describe ::API::Entities::MergeRequestBasic do
   end
 
   context 'reviewers' do
-    context "when merge_request_reviewers FF is enabled" do
-      before do
-        stub_feature_flags(merge_request_reviewers: true)
-        merge_request.reviewers = [user]
-      end
-
-      it 'includes assigned reviewers' do
-        result = Gitlab::Json.parse(present(merge_request).to_json)
-
-        expect(result['reviewers'][0]['username']).to eq user.username
-      end
+    before do
+      merge_request.reviewers = [user]
     end
 
-    context "when merge_request_reviewers FF is disabled" do
-      before do
-        stub_feature_flags(merge_request_reviewers: false)
-      end
-
-      it 'does not include reviewers' do
-        result = Gitlab::Json.parse(present(merge_request).to_json)
+    it 'includes assigned reviewers' do
+      result = Gitlab::Json.parse(present(merge_request).to_json)
 
-        expect(result.keys).not_to include('reviewers')
-      end
+      expect(result['reviewers'][0]['username']).to eq user.username
     end
   end
 end
diff --git a/spec/lib/api/entities/user_spec.rb b/spec/lib/api/entities/user_spec.rb
index 99ffe0eb925..e35deeb6263 100644
--- a/spec/lib/api/entities/user_spec.rb
+++ b/spec/lib/api/entities/user_spec.rb
@@ -23,4 +23,16 @@ RSpec.describe API::Entities::User do
 
     expect(subject).not_to include(:created_at)
   end
+
+  it 'exposes user as not a bot' do
+    expect(subject[:bot]).to be_falsey
+  end
+
+  context 'with bot user' do
+    let(:user) { create(:user, :security_bot) }
+
+    it 'exposes user as a bot' do
+      expect(subject[:bot]).to eq(true)
+    end
+  end
 end
diff --git a/spec/lib/api/support/git_access_actor_spec.rb b/spec/lib/api/support/git_access_actor_spec.rb
index 143cc6e56ee..a09cabf4cd7 100644
--- a/spec/lib/api/support/git_access_actor_spec.rb
+++ b/spec/lib/api/support/git_access_actor_spec.rb
@@ -152,6 +152,10 @@ RSpec.describe API::Support::GitAccessActor do
   end
 
   describe '#update_last_used_at!' do
+    before do
+      stub_feature_flags(disable_ssh_key_used_tracking: false)
+    end
+
     context 'when initialized with a User' do
       let(:user) { build(:user) }
 
@@ -170,6 +174,14 @@ RSpec.describe API::Support::GitAccessActor do
 
         subject.update_last_used_at!
       end
+
+      it 'does not update `last_used_at` when the functionality is disabled' do
+        stub_feature_flags(disable_ssh_key_used_tracking: true)
+
+        expect(key).not_to receive(:update_last_used_at)
+
+        subject.update_last_used_at!
+      end
     end
   end
 end