Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

1 files changed, 2 insertions, 18 deletions

diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index dbb15fad246..3cccc41a892 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -803,7 +803,7 @@ RSpec.describe CommitStatus do
   describe 'ensure stage assignment' do
     context 'when commit status has a stage_id assigned' do
       let!(:stage) do
-        create(:ci_stage_entity, project: project, pipeline: pipeline)
+        create(:ci_stage, project: project, pipeline: pipeline)
       end
 
       let(:commit_status) do
@@ -836,7 +836,7 @@ RSpec.describe CommitStatus do
 
     context 'when commit status does not have stage but it exists' do
       let!(:stage) do
-        create(:ci_stage_entity, project: project,
+        create(:ci_stage, project: project,
                                  pipeline: pipeline,
                                  name: 'test')
       end
@@ -984,22 +984,6 @@ RSpec.describe CommitStatus do
     end
   end
 
-  describe '.bulk_insert_tags!' do
-    let(:statuses) { double('statuses') }
-    let(:inserter) { double('inserter') }
-
-    it 'delegates to bulk insert class' do
-      expect(Gitlab::Ci::Tags::BulkInsert)
-        .to receive(:new)
-        .with(statuses)
-        .and_return(inserter)
-
-      expect(inserter).to receive(:insert!)
-
-      described_class.bulk_insert_tags!(statuses)
-    end
-  end
-
   describe '#expire_etag_cache!' do
     it 'expires the etag cache' do
       expect_next_instance_of(Gitlab::EtagCaching::Store) do |etag_store|