Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 53 insertions, 0 deletions

diff --git a/spec/lib/gitlab/ci/yaml_processor/result_spec.rb b/spec/lib/gitlab/ci/yaml_processor/result_spec.rb
index e345cd4de9b..25705fd4260 100644
--- a/spec/lib/gitlab/ci/yaml_processor/result_spec.rb
+++ b/spec/lib/gitlab/ci/yaml_processor/result_spec.rb
@@ -39,6 +39,59 @@ module Gitlab
             expect(expanded_config).to include(*included_config.keys)
           end
         end
+
+        describe '#yaml_variables_for' do
+          let(:config_content) do
+            <<~YAML
+              variables:
+                VAR1: value 1
+                VAR2: value 2
+
+              job:
+                script: echo 'hello'
+                variables:
+                  VAR1: value 11
+            YAML
+          end
+
+          let(:job_name) { :job }
+
+          subject(:yaml_variables_for) { result.yaml_variables_for(job_name) }
+
+          it 'returns calculated variables with root and job variables' do
+            is_expected.to match_array([
+              { key: 'VAR1', value: 'value 11', public: true },
+              { key: 'VAR2', value: 'value 2', public: true }
+            ])
+          end
+
+          context 'when an absent job is sent' do
+            let(:job_name) { :invalid_job }
+
+            it { is_expected.to eq([]) }
+          end
+        end
+
+        describe '#stage_for' do
+          let(:config_content) do
+            <<~YAML
+              job:
+                script: echo 'hello'
+            YAML
+          end
+
+          let(:job_name) { :job }
+
+          subject(:stage_for) { result.stage_for(job_name) }
+
+          it { is_expected.to eq('test') }
+
+          context 'when an absent job is sent' do
+            let(:job_name) { :invalid_job }
+
+            it { is_expected.to be_nil }
+          end
+        end
       end
     end
   end