Fix error when CI job variables not specified

2 files changed, 40 insertions, 18 deletions

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index a66602f9194..ea296d05b2b 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -54,7 +54,7 @@ module Ci
       job = @jobs[name.to_sym]
       return [] unless job
 
-      job.fetch(:variables, [])
+      job[:variables] || []
     end
 
     private
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index 143e2e6d238..1c775c182f1 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -287,13 +287,13 @@ module Ci
       end
 
     end
-    
+
     describe "Scripts handling" do
       let(:config_data) { YAML.dump(config) }
       let(:config_processor) { GitlabCiYamlProcessor.new(config_data, path) }
-      
+
       subject { config_processor.builds_for_stage_and_ref("test", "master").first }
-      
+
       describe "before_script" do
         context "in global context" do
           let(:config) do
@@ -302,12 +302,12 @@ module Ci
               test: { script: ["script"] }
             }
           end
-          
+
           it "return commands with scripts concencaced" do
             expect(subject[:commands]).to eq("global script\nscript")
           end
         end
- 
+
         context "overwritten in local context" do
           let(:config) do
             {
@@ -465,19 +465,41 @@ module Ci
         end
 
         context 'when syntax is incorrect' do
-          it 'raises error' do
-            variables = [:KEY1, 'value1', :KEY2, 'value2']
-
-            config =  YAML.dump(
-              { before_script: ['pwd'],
-                rspec: {
-                  variables: variables,
-                  script: 'rspec' }
-              })
+          context 'when variables defined but invalid' do
+            it 'raises error' do
+              variables = [:KEY1, 'value1', :KEY2, 'value2']
+
+              config =  YAML.dump(
+                { before_script: ['pwd'],
+                  rspec: {
+                    variables: variables,
+                    script: 'rspec' }
+                })
+
+              expect { GitlabCiYamlProcessor.new(config, path) }
+                .to raise_error(GitlabCiYamlProcessor::ValidationError,
+                                 /job: variables should be a map/)
+            end
+          end
 
-            expect { GitlabCiYamlProcessor.new(config, path) }
-              .to raise_error(GitlabCiYamlProcessor::ValidationError,
-                               /job: variables should be a map/)
+          context 'when variables key defined but value not specified' do
+            it 'returns empty array' do
+              config =  YAML.dump(
+                { before_script: ['pwd'],
+                  rspec: {
+                    variables: nil,
+                    script: 'rspec' }
+                })
+
+              config_processor = GitlabCiYamlProcessor.new(config, path)
+
+              ##
+              #  TODO, in next version of CI configuration processor this
+              # should be invalid configuration, see #18775 and #15060
+              #
+              expect(config_processor.job_variables(:rspec))
+                .to be_an_instance_of(Array).and be_empty
+            end
           end
         end
       end