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

Fix variable to keep it backward-compatible in strict mode

Browse Source 
* lax_parse    - no changes
  * strict_parse - uses the `lax_parse_filter_expressions` (as it was doing before)
  * rigid_parse  - uses the `rigid_parse_filter_expressions`
This commit is contained in:
Guilherme Carreiro
2025-10-27 16:33:31 +01:00
committed by Guilherme Carreiro
parent 738540a601
commit a23c71e40b
3 changed files with 109 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/unit/variable_unit_test.rb
+30 -20
View File
@@ -154,33 +154,43 @@ class VariableUnitTest < Minitest::Test
end
def test_strict_filter_argument_parsing
# optional colon
var = create_variable(%(n | f1 | f2:), error_mode: :strict)
assert_equal([['f1', []], ['f2', []]], var.filters)
with_error_mode(:strict) do
assert_raises(SyntaxError) do
create_variable(%( number_of_comments | pluralize: 'comment': 'comments' ))
end
end
end
# missing argument throws error
assert_raises(SyntaxError) { create_variable(%(n | f1: ,), error_mode: :strict) }
assert_raises(SyntaxError) { create_variable(%(n | f1: ,| f2), error_mode: :strict) }
def test_rigid_filter_argument_parsing
with_error_mode(:rigid) do
# optional colon
var = create_variable(%(n | f1 | f2:))
assert_equal([['f1', []], ['f2', []]], var.filters)
# arg requires colon
assert_raises(SyntaxError) { create_variable(%(n | f1 1), error_mode: :strict) }
# missing argument throws error
assert_raises(SyntaxError) { create_variable(%(n | f1: ,)) }
assert_raises(SyntaxError) { create_variable(%(n | f1: ,| f2)) }
# trailing comma doesn't throw
create_variable(%(n | f1: 1, 2, 3, | f2:), error_mode: :strict)
# arg requires colon
assert_raises(SyntaxError) { create_variable(%(n | f1 1)) }
# missing comma throws error
assert_raises(SyntaxError) { create_variable(%(n | filter: 1 2, 3), error_mode: :strict) }
# trailing comma doesn't throw
create_variable(%(n | f1: 1, 2, 3, | f2:))
# positional and kwargs parsing
var = create_variable(%(n | filter: 1, 2, 3 | filter2: k1: 1, k2: 2), error_mode: :strict)
assert_equal([['filter', [1, 2, 3]], ['filter2', [], { "k1" => 1, "k2" => 2 }]], var.filters)
# missing comma throws error
assert_raises(SyntaxError) { create_variable(%(n | filter: 1 2, 3)) }
# positional and kwargs intermixed (pos1, key1: val1, pos2)
var = create_variable(%(n | link_to: class: "black", "https://example.com", title: "title"), error_mode: :strict)
assert_equal([['link_to', ["https://example.com"], { "class" => "black", "title" => "title" }]], var.filters)
# positional and kwargs parsing
var = create_variable(%(n | filter: 1, 2, 3 | filter2: k1: 1, k2: 2))
assert_equal([['filter', [1, 2, 3]], ['filter2', [], { "k1" => 1, "k2" => 2 }]], var.filters)
# string key throws
assert_raises(SyntaxError) { create_variable(%(n | pluralize: 'comment': 'comments'), error_mode: :strict) }
# positional and kwargs intermixed (pos1, key1: val1, pos2)
var = create_variable(%(n | link_to: class: "black", "https://example.com", title: "title"))
assert_equal([['link_to', ["https://example.com"], { "class" => "black", "title" => "title" }]], var.filters)
# string key throws
assert_raises(SyntaxError) { create_variable(%(n | pluralize: 'comment': 'comments')) }
end
end
def test_output_raw_source_of_variable