Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42

1 files changed, 28 insertions, 0 deletions

diff --git a/spec/lib/gitlab/ci/config_spec.rb b/spec/lib/gitlab/ci/config_spec.rb
index fdf152b3584..76be65d91c4 100644
--- a/spec/lib/gitlab/ci/config_spec.rb
+++ b/spec/lib/gitlab/ci/config_spec.rb
@@ -43,6 +43,34 @@ RSpec.describe Gitlab::Ci::Config, feature_category: :pipeline_composition do
         expect(config.to_hash).to eq hash
       end
 
+      context 'when yml has stages' do
+        let(:yml) do
+          <<-EOS
+            image: image:1.0
+            stages:
+              - custom_stage
+            rspec:
+              script:
+                - gem install rspec
+                - rspec
+          EOS
+        end
+
+        specify do
+          expect(config.to_hash[:stages]).to eq(['.pre', 'custom_stage', '.post'])
+        end
+
+        context 'with inject_edge_stages option disabled' do
+          let(:config) do
+            described_class.new(yml, project: nil, pipeline: nil, sha: nil, user: nil, inject_edge_stages: false)
+          end
+
+          specify do
+            expect(config.to_hash[:stages]).to contain_exactly('custom_stage')
+          end
+        end
+      end
+
       describe '#valid?' do
         it 'is valid' do
           expect(config).to be_valid