Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 13 insertions, 1 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 e0d656f456e..f451bd6bfef 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/config/content_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/config/content_spec.rb
@@ -11,7 +11,9 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Config::Content do
 
   subject { described_class.new(pipeline, command) }
 
-  describe '#perform!' do
+  # 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
     context 'when bridge job is passed in as parameter' do
       let(:ci_config_path) { nil }
       let(:bridge) { create(:ci_bridge) }
@@ -201,4 +203,14 @@ 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