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:37:43 -04:00
parent 5d7c00a202
commit 49f2af4209
3 changed files with 31 additions and 10 deletions
+2 -2
View File
@@ -32,13 +32,13 @@ module Minitest
include Liquid
def assert_template_result(expected, template, assigns = {}, message = nil)
assert_equal expected, Template.parse(template).render!(assigns)
assert_equal expected, Template.parse(template).render!(assigns), message
end
def assert_template_result_matches(expected, template, assigns = {}, message = nil)
return assert_template_result(expected, template, assigns, message) unless expected.is_a? Regexp
assert_match expected, Template.parse(template).render!(assigns)
assert_match expected, Template.parse(template).render!(assigns), message
end
def assert_match_syntax_error(match, template, registers = {})