Merge pull request #476 from Shopify/missing-variable-name-error

Disallow filters with no variable in strict mode
This commit is contained in:
Justin Li
2014-10-27 13:56:11 -04:00
2 changed files with 9 additions and 6 deletions

View File

@@ -62,8 +62,8 @@ module Liquid
@filters = []
p = Parser.new(markup)
# Could be just filters with no input
@name = p.look(:pipe) ? nil : Expression.parse(p.expression)
@name = Expression.parse(p.expression)
while p.consume?(:pipe)
filtername = p.consume(:id)
filterargs = p.consume?(:colon) ? parse_filterargs(p) : []

View File

@@ -28,11 +28,14 @@ class ParsingQuirksTest < Minitest::Test
def test_error_on_empty_filter
assert Template.parse("{{test}}")
assert Template.parse("{{|test}}")
with_error_mode(:lax) do
assert Template.parse("{{|test}}")
end
with_error_mode(:strict) do
assert_raises(SyntaxError) do
Template.parse("{{test |a|b|}}")
end
assert_raises(SyntaxError) { Template.parse("{{|test}}") }
assert_raises(SyntaxError) { Template.parse("{{test |a|b|}}") }
end
end