Revert "Merge pull request #1359 from Shopify/pz-instrument-range-floats"

This reverts commit 300adfd7ae, reversing
changes made to ed0aebcbc9.
This commit is contained in:
Peter Zhu
2020-12-01 14:37:23 -05:00
parent 29d5d9674a
commit ba657871bc
2 changed files with 2 additions and 22 deletions

View File

@@ -8,8 +8,6 @@ module Liquid
if start_obj.respond_to?(:evaluate) || end_obj.respond_to?(:evaluate)
new(start_obj, end_obj)
else
Usage.increment('range_float') if start_obj.is_a?(Float) || end_obj.is_a?(Float)
start_obj.to_i..end_obj.to_i
end
end

View File

@@ -31,33 +31,15 @@ class ExpressionTest < Minitest::Test
assert_equal(3..4, parse_and_eval(" ( 3 .. 4 ) "))
end
def test_instrument_range_float
assert_usage_increment('range_float') do
parse("(1.0..2.0)")
end
assert_usage_increment('range_float') do
parse("(1.0..2)")
end
assert_usage_increment('range_float', times: 0) do
parse("(1..2)")
end
end
private
def parse(markup)
def parse_and_eval(markup, **assigns)
if Liquid::Template.error_mode == :strict
p = Liquid::Parser.new(markup)
markup = p.expression
p.consume(:end_of_string)
end
Liquid::Expression.parse(markup)
end
def parse_and_eval(markup, **assigns)
expression = parse(markup)
expression = Liquid::Expression.parse(markup)
context = Liquid::Context.new(assigns)
context.evaluate(expression)
end