Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 7 insertions, 5 deletions

diff --git a/spec/lib/gitlab/data_builder/build_spec.rb b/spec/lib/gitlab/data_builder/build_spec.rb
index 544b210651b..92fef93bddb 100644
--- a/spec/lib/gitlab/data_builder/build_spec.rb
+++ b/spec/lib/gitlab/data_builder/build_spec.rb
@@ -2,10 +2,11 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::DataBuilder::Build do
+RSpec.describe Gitlab::DataBuilder::Build, feature_category: :integrations do
   let_it_be(:runner) { create(:ci_runner, :instance, :tagged_only) }
   let_it_be(:user) { create(:user, :public_email) }
-  let_it_be(:ci_build) { create(:ci_build, :running, runner: runner, user: user) }
+  let_it_be(:pipeline) { create(:ci_pipeline, name: 'Build pipeline') }
+  let_it_be(:ci_build) { create(:ci_build, :running, pipeline: pipeline, runner: runner, user: user) }
 
   describe '.build' do
     around do |example|
@@ -33,6 +34,7 @@ RSpec.describe Gitlab::DataBuilder::Build do
     it { expect(data[:project_name]).to eq(ci_build.project.full_name) }
     it { expect(data[:pipeline_id]).to eq(ci_build.pipeline.id) }
     it { expect(data[:retries_count]).to eq(ci_build.retries_count) }
+    it { expect(data[:commit][:name]).to eq(pipeline.name) }
 
     it {
       expect(data[:user]).to eq(
@@ -61,10 +63,10 @@ RSpec.describe Gitlab::DataBuilder::Build do
         described_class.build(b) # Don't use ci_build variable here since it has all associations loaded into memory
       end
 
-      expect(control.count).to eq(13)
+      expect(control.count).to eq(14)
     end
 
-    context 'when feature flag is disabled' do
+    context 'when job_webhook_retries_count feature flag is disabled' do
       before do
         stub_feature_flags(job_webhook_retries_count: false)
       end
@@ -79,7 +81,7 @@ RSpec.describe Gitlab::DataBuilder::Build do
           described_class.build(b) # Don't use ci_build variable here since it has all associations loaded into memory
         end
 
-        expect(control.count).to eq(12)
+        expect(control.count).to eq(13)
       end
     end