kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-01 15:55:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Merge pull request #1350 from Shopify/pz-instrument-invalid-end-tag"

Browse Source 
This reverts commit e6eef4b2c4, reversing
changes made to c7c21e88f0.
This commit is contained in:
Peter Zhu
2020-12-01 14:38:04 -05:00
parent ba657871bc
commit bbfcaa2cc0
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/liquid/block.rb
View File

@@ -77,9 +77,6 @@ module Liquid
body.parse(tokens, parse_context) do |end_tag_name, end_tag_params| body.parse(tokens, parse_context) do |end_tag_name, end_tag_params|
@blank &&= body.blank? @blank &&= body.blank?
# Instrument for bug 1346
Usage.increment("end_tag_params") if end_tag_params && !end_tag_params.empty?
return false if end_tag_name == block_delimiter return false if end_tag_name == block_delimiter
raise_tag_never_closed(block_name) unless end_tag_name raise_tag_never_closed(block_name) unless end_tag_name

20
test/integration/block_test.rb
View File

@@ -55,24 +55,4 @@ class BlockTest < Minitest::Test
assert_equal buf.object_id, output.object_id assert_equal buf.object_id, output.object_id
end end
end end
def test_instrument_for_bug_1346
calls = []
Liquid::Usage.stub(:increment, ->(name) { calls << name }) do
Liquid::Template.parse("{% for i in (1..2) %}{{ i }}{% endfor {% foo %}")
end
assert_equal(["end_tag_params"], calls)
calls = []
Liquid::Usage.stub(:increment, ->(name) { calls << name }) do
Liquid::Template.parse("{% for i in (1..2) %}{{ i }}{% endfor test %}")
end
assert_equal(["end_tag_params"], calls)
calls = []
Liquid::Usage.stub(:increment, ->(name) { calls << name }) do
Liquid::Template.parse("{% for i in (1..2) %}{{ i }}{% endfor %}")
end
assert_equal([], calls)
end
end end