Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 1 insertions, 13 deletions

diff --git a/spec/lib/gitlab/ci/pipeline/chain/config/content_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/config/content_spec.rb
index f451bd6bfef..e0d656f456e 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/config/content_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/config/content_spec.rb
@@ -11,9 +11,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Config::Content do
 
   subject { described_class.new(pipeline, command) }
 
-  # TODO: change this to `describe` and remove rubocop-disable
-  #   when removing the FF ci_project_pipeline_config_refactoring
-  shared_context '#perform!' do # rubocop:disable RSpec/ContextWording
+  describe '#perform!' do
     context 'when bridge job is passed in as parameter' do
       let(:ci_config_path) { nil }
       let(:bridge) { create(:ci_bridge) }
@@ -203,14 +201,4 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Config::Content do
       end
     end
   end
-
-  it_behaves_like '#perform!'
-
-  context 'when the FF ci_project_pipeline_config_refactoring is disabled' do
-    before do
-      stub_feature_flags(ci_project_pipeline_config_refactoring: false)
-    end
-
-    it_behaves_like '#perform!'
-  end
 end