From ba657871bc4afe32c01415769d88063e6d340fc8 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 1 Dec 2020 14:37:23 -0500 Subject: [PATCH] Revert "Merge pull request #1359 from Shopify/pz-instrument-range-floats" This reverts commit 300adfd7ae108b3eb5a9460f7b6180777086f1d5, reversing changes made to ed0aebcbc93cade8719da79b72470435c54e938c. --- lib/liquid/range_lookup.rb | 2 -- test/integration/expression_test.rb | 22 ++-------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/lib/liquid/range_lookup.rb b/lib/liquid/range_lookup.rb index 4636a0a..57bccd0 100644 --- a/lib/liquid/range_lookup.rb +++ b/lib/liquid/range_lookup.rb @@ -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 diff --git a/test/integration/expression_test.rb b/test/integration/expression_test.rb index cc8ccae..91a0494 100644 --- a/test/integration/expression_test.rb +++ b/test/integration/expression_test.rb @@ -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