Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 4 deletions

diff --git a/spec/services/ci/process_pipeline_service_spec.rb b/spec/services/ci/process_pipeline_service_spec.rb
index 254bd19c808..b5bf0adadaf 100644
--- a/spec/services/ci/process_pipeline_service_spec.rb
+++ b/spec/services/ci/process_pipeline_service_spec.rb
@@ -3,8 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Ci::ProcessPipelineService do
-  let(:user) { create(:user) }
-  let(:project) { create(:project) }
+  let_it_be(:project) { create(:project) }
 
   let(:pipeline) do
     create(:ci_empty_pipeline, ref: 'master', project: project)
@@ -24,8 +23,6 @@ RSpec.describe Ci::ProcessPipelineService do
     stub_ci_pipeline_to_return_yaml_file
     stub_not_protect_default_branch
 
-    project.add_developer(user)
-
     allow(subject).to receive(:metrics).and_return(metrics)
   end
 
@@ -69,6 +66,14 @@ RSpec.describe Ci::ProcessPipelineService do
         subject.execute
       end
 
+      it 'logs the project and pipeline id' do
+        expect(Gitlab::AppJsonLogger).to receive(:info).with(event: 'update_retried_is_used',
+                                                             project_id: project.id,
+                                                             pipeline_id: pipeline.id)
+
+        subject.execute
+      end
+
       context 'when the previous build has already retried column true' do
         before do
           build_retried.update_columns(retried: true)