Merge pull request #570 from Shopify/fix-strict-conditions

Fix condition parse order in strict mode
This commit is contained in:
Justin Li
2015-05-28 16:33:54 -04:00
parent 5d7c00a202
commit 49f2af4209
3 changed files with 31 additions and 10 deletions

View File

@@ -166,4 +166,25 @@ class IfElseTagTest < Minitest::Test
assert_template_result('', %({% if 1 or throw or or 1 %}yes{% endif %}))
end
end
def test_multiple_conditions
tpl = "{% if a or b and c %}true{% else %}false{% endif %}"
tests = {
[true, true, true] => true,
[true, true, false] => true,
[true, false, true] => true,
[true, false, false] => true,
[false, true, true] => true,
[false, true, false] => false,
[false, false, true] => false,
[false, false, false] => false,
}
tests.each do |vals, expected|
a, b, c = vals
assigns = { 'a' => a, 'b' => b, 'c' => c }
assert_template_result expected.to_s, tpl, assigns, assigns.to_s
end
end
end