Compare commits

...

1 Commits

Author SHA1 Message Date
Maarten van Grootel
d7e7285fcb Fix leaking error when comparison leads to TypeError 2017-01-16 12:26:19 -05:00
2 changed files with 6 additions and 1 deletions

View File

@@ -113,7 +113,7 @@ module Liquid
elsif left.respond_to?(operation) && right.respond_to?(operation)
begin
left.send(operation, right)
rescue ::ArgumentError => e
rescue ::ArgumentError, TypeError => e
raise Liquid::ArgumentError.new(e.message)
end
end

View File

@@ -57,6 +57,11 @@ class ConditionUnitTest < Minitest::Test
assert_evaluates_argument_error 1, '~~', 0
end
def test_comparing_hash_and_integer
assert_evaluates_argument_error({a: 1}, '>', 1)
assert_evaluates_argument_error(1, '>', {a: 1})
end
def test_comparation_of_int_and_str
assert_evaluates_argument_error '1', '>', 0
assert_evaluates_argument_error '1', '<', 0