diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-02-23 11:23:18 +0100 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-02-23 11:23:18 +0100 |
commit | 84c14a4ac23e88a7110096cfeb20e2d8c9222a2f (patch) | |
tree | 2f0be8aa6f56c6369da8c0a747361d171973c6c6 /lib/gitlab/ci/pipeline | |
parent | ba70e50ec36d592720d73f4d5b2ad287f3f95d46 (diff) | |
download | gitlab-ce-84c14a4ac23e88a7110096cfeb20e2d8c9222a2f.tar.gz |
Add missing specs for pipeline expression lexemes
Diffstat (limited to 'lib/gitlab/ci/pipeline')
5 files changed, 6 insertions, 6 deletions
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/equals.rb b/lib/gitlab/ci/pipeline/expression/lexeme/equals.rb index 18e4db49eee..b499d41a509 100644 --- a/lib/gitlab/ci/pipeline/expression/lexeme/equals.rb +++ b/lib/gitlab/ci/pipeline/expression/lexeme/equals.rb @@ -11,7 +11,7 @@ module Gitlab @right = right end - def evaluate(variables) + def evaluate(**variables) @left.evaluate(variables) == @right.evaluate(variables) end diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/null.rb b/lib/gitlab/ci/pipeline/expression/lexeme/null.rb index b62e72cde2a..7f9464c583d 100644 --- a/lib/gitlab/ci/pipeline/expression/lexeme/null.rb +++ b/lib/gitlab/ci/pipeline/expression/lexeme/null.rb @@ -10,7 +10,7 @@ module Gitlab @value = value end - def evaluate(_) + def evaluate(**_) nil end diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/string.rb b/lib/gitlab/ci/pipeline/expression/lexeme/string.rb index d655b029315..6f77d443c3c 100644 --- a/lib/gitlab/ci/pipeline/expression/lexeme/string.rb +++ b/lib/gitlab/ci/pipeline/expression/lexeme/string.rb @@ -10,7 +10,7 @@ module Gitlab @value = value end - def evaluate(_) + def evaluate(**_) @value.to_s end diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/variable.rb b/lib/gitlab/ci/pipeline/expression/lexeme/variable.rb index ccf1fdfae2c..ad002447b88 100644 --- a/lib/gitlab/ci/pipeline/expression/lexeme/variable.rb +++ b/lib/gitlab/ci/pipeline/expression/lexeme/variable.rb @@ -10,8 +10,8 @@ module Gitlab @name = name end - def evaluate(variables) - variables[@name] + def evaluate(**variables) + variables[@name.to_sym] end def self.build(string) diff --git a/lib/gitlab/ci/pipeline/expression/statement.rb b/lib/gitlab/ci/pipeline/expression/statement.rb index 4f0e101b730..08e662eccf9 100644 --- a/lib/gitlab/ci/pipeline/expression/statement.rb +++ b/lib/gitlab/ci/pipeline/expression/statement.rb @@ -18,7 +18,7 @@ module Gitlab @lexer = Expression::Lexer.new(statement) @variables = pipeline.variables.map do |variable| - [variable.key, variable.value] + [variable.key.to_sym, variable.value] end end |