kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-01 15:55:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1458 from Shopify/use-to-liquid-value-with-conditions

Browse Source 
use Utils.to_liquid_value on conditionals
This commit is contained in:
Michael Go
2021-06-15 12:18:14 -03:00
committed by GitHub
parent aa8ce87b96 f686c5dec7
commit 50d1a2ffc9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/liquid/condition.rb
View File

@@ -134,8 +134,8 @@ module Liquid
# return this as the result. # return this as the result.
return context.evaluate(left) if op.nil? return context.evaluate(left) if op.nil?
left = context.evaluate(left) left = Liquid::Utils.to_liquid_value(context.evaluate(left))
right = context.evaluate(right) right = Liquid::Utils.to_liquid_value(context.evaluate(right))
operation = self.class.operators[op] || raise(Liquid::ArgumentError, "Unknown operator #{op}") operation = self.class.operators[op] || raise(Liquid::ArgumentError, "Unknown operator #{op}")

2
test/integration/variable_test.rb
View File

@@ -25,6 +25,8 @@ class VariableTest < Minitest::Test
def test_if_tag_calls_to_liquid_value def test_if_tag_calls_to_liquid_value
assert_template_result('one', '{% if foo == 1 %}one{% endif %}', 'foo' => IntegerDrop.new('1')) assert_template_result('one', '{% if foo == 1 %}one{% endif %}', 'foo' => IntegerDrop.new('1'))
assert_template_result('one', '{% if 0 < foo %}one{% endif %}', 'foo' => IntegerDrop.new('1'))
assert_template_result('one', '{% if foo > 0 %}one{% endif %}', 'foo' => IntegerDrop.new('1'))
assert_template_result('true', '{% if foo == true %}true{% endif %}', 'foo' => BooleanDrop.new(true)) assert_template_result('true', '{% if foo == true %}true{% endif %}', 'foo' => BooleanDrop.new(true))
assert_template_result('true', '{% if foo %}true{% endif %}', 'foo' => BooleanDrop.new(true)) assert_template_result('true', '{% if foo %}true{% endif %}', 'foo' => BooleanDrop.new(true))