Merge branch 'feature/gb/pipeline-variable-expressions' into feature/gb/variables-expressions-in-only-except

* feature/gb/pipeline-variable-expressions:
  Do not use keyword args to pass expression variables

1 files changed, 7 insertions, 0 deletions

diff --git a/spec/lib/gitlab/ci/pipeline/expression/lexeme/variable_spec.rb b/spec/lib/gitlab/ci/pipeline/expression/lexeme/variable_spec.rb
index 91f59669b02..599a5411881 100644
--- a/spec/lib/gitlab/ci/pipeline/expression/lexeme/variable_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/expression/lexeme/variable_spec.rb
@@ -22,6 +22,13 @@ describe Gitlab::Ci::Pipeline::Expression::Lexeme::Variable do
         .to eq 'my variable'
     end
 
+    it 'allows to use a string as a variable key too' do
+      variable = described_class.new('VARIABLE')
+
+      expect(variable.evaluate('VARIABLE' => 'my variable'))
+        .to eq 'my variable'
+    end
+
     it 'returns nil if it is not defined' do
       variable = described_class.new('VARIABLE')