Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-26 13:45:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Call to_liquid_value when short circuiting conditions

Browse Source
This commit is contained in:
Marco Rudilosso
2023-07-19 15:22:12 +00:00
parent 5e92b3a89a
commit 21d6197533
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/condition.rb
+2 -2
View File
@@ -69,9 +69,9 @@ module Liquid
case condition.child_relation case condition.child_relation
when :or when :or
break if result break if Liquid::Utils.to_liquid_value(result)
when :and when :and
break unless result break unless Liquid::Utils.to_liquid_value(result)
else else
break break
end end
test/integration/variable_test.rb
+1
View File
@@ -34,6 +34,7 @@ class VariableTest < Minitest::Test
assert_template_result('', '{% if foo %}true{% endif %}', { 'foo' => BooleanDrop.new(false) }) assert_template_result('', '{% if foo %}true{% endif %}', { 'foo' => BooleanDrop.new(false) })
assert_template_result('', '{% if foo == true %}True{% endif %}', { 'foo' => BooleanDrop.new(false) }) assert_template_result('', '{% if foo == true %}True{% endif %}', { 'foo' => BooleanDrop.new(false) })
assert_template_result('', '{% if foo and true %}SHOULD NOT HAPPEN{% endif %}', { 'foo' => BooleanDrop.new(false) })
assert_template_result('one', '{% if a contains x %}one{% endif %}', { 'a' => [1], 'x' => IntegerDrop.new(1) }) assert_template_result('one', '{% if a contains x %}one{% endif %}', { 'a' => [1], 'x' => IntegerDrop.new(1) })
end end