Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

2 files changed, 33 insertions, 2 deletions

diff --git a/spec/services/users/dismiss_user_callout_service_spec.rb b/spec/services/users/dismiss_user_callout_service_spec.rb
new file mode 100644
index 00000000000..22f84a939f7
--- /dev/null
+++ b/spec/services/users/dismiss_user_callout_service_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Users::DismissUserCalloutService do
+  let(:user) { create(:user) }
+
+  let(:service) do
+    described_class.new(
+      container: nil, current_user: user, params: { feature_name: UserCallout.feature_names.each_key.first }
+    )
+  end
+
+  describe '#execute' do
+    subject(:execute) { service.execute }
+
+    it 'returns a user callout' do
+      expect(execute).to be_an_instance_of(UserCallout)
+    end
+
+    it 'sets the dismisse_at attribute to current time' do
+      freeze_time do
+        expect(execute).to have_attributes(dismissed_at: Time.current)
+      end
+    end
+  end
+end
diff --git a/spec/services/users/refresh_authorized_projects_service_spec.rb b/spec/services/users/refresh_authorized_projects_service_spec.rb
index cc01b22f9d2..1e74ff3d9eb 100644
--- a/spec/services/users/refresh_authorized_projects_service_spec.rb
+++ b/spec/services/users/refresh_authorized_projects_service_spec.rb
@@ -152,9 +152,13 @@ RSpec.describe Users::RefreshAuthorizedProjectsService do
       expect(Gitlab::AppJsonLogger).to(
         receive(:info)
           .with(event: 'authorized_projects_refresh',
+                user_id: user.id,
                 'authorized_projects_refresh.source': source,
-                'authorized_projects_refresh.rows_deleted': 0,
-                'authorized_projects_refresh.rows_added': 1))
+                'authorized_projects_refresh.rows_deleted_count': 0,
+                'authorized_projects_refresh.rows_added_count': 1,
+                'authorized_projects_refresh.rows_deleted_slice': [],
+                'authorized_projects_refresh.rows_added_slice': [[user.id, project.id, Gitlab::Access::MAINTAINER]])
+      )
 
       service.update_authorizations([], [[user.id, project.id, Gitlab::Access::MAINTAINER]])
     end