From 37e40673ff6fa4d31bdcb2ac9c1e7e50fe8a2284 Mon Sep 17 00:00:00 2001
From: Mike Angell <mike.angell@shopify.com>
Date: Fri, 4 Oct 2019 17:00:54 +1000
Subject: [PATCH 1/2] Filter test

---
 test/integration/standard_filter_test.rb | 47 ++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/test/integration/standard_filter_test.rb b/test/integration/standard_filter_test.rb
index bf28539..23e934c 100644
--- a/test/integration/standard_filter_test.rb
+++ b/test/integration/standard_filter_test.rb
@@ -754,6 +754,53 @@ class StandardFiltersTest < Minitest::Test
     assert_nil @filters.where([nil], "ok")
   end
 
+  def test_all_filters_never_raise_non_liquid_exception
+    test_drop = TestDrop.new
+    test_drop.context = Context.new
+    test_enum = TestEnumerable.new
+    test_enum.context = Context.new
+    test_types = [
+      "foo",
+      123,
+      0,
+      0.0,
+      -1234.003030303,
+      -99999999,
+      1234.38383000383830003838300,
+      nil,
+      true,
+      false,
+      TestThing.new,
+      test_drop,
+      test_enum,
+      ["foo", "bar"],
+      { "foo" => "bar" },
+      { foo: "bar" },
+      [{ "foo" => "bar" }, { "foo" => 123 }, { "foo" => nil }, { "foo" => true }, { "foo" => ["foo", "bar"] }],
+      { 1 => "bar" },
+      ["foo", 123, nil, true, false, Drop, ["foo"], { foo: "bar" }],
+    ]
+    errors = []
+    test_types.each do |first|
+      test_types.each do |other|
+        (@filters.methods - Object.methods).each do |method|
+          arg_count = @filters.method(method).arity
+          arg_count *= -1 if arg_count < 0
+          inputs = [first]
+          inputs << ([other] * (arg_count - 1)) if arg_count > 1
+          begin
+            @filters.send(method, *inputs)
+          rescue Liquid::ArgumentError => e
+            errors << "#{method} returned #{e.message}"
+          rescue Liquid::ZeroDivisionError => e
+            errors << "#{method} returned #{e.message}"
+          end
+        end
+      end
+    end
+    errors
+  end
+
   def test_where_no_target_value
     input = [
       { "foo" => false },

From b0f8c2c03ebcbb0714b7ca32a0eea7899d8add43 Mon Sep 17 00:00:00 2001
From: Mike Angell <mike.angell@shopify.com>
Date: Sat, 5 Oct 2019 01:13:35 +1000
Subject: [PATCH 2/2] Remove error logging

---
 test/integration/standard_filter_test.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/integration/standard_filter_test.rb b/test/integration/standard_filter_test.rb
index 23e934c..cc99148 100644
--- a/test/integration/standard_filter_test.rb
+++ b/test/integration/standard_filter_test.rb
@@ -780,7 +780,6 @@ class StandardFiltersTest < Minitest::Test
       { 1 => "bar" },
       ["foo", 123, nil, true, false, Drop, ["foo"], { foo: "bar" }],
     ]
-    errors = []
     test_types.each do |first|
       test_types.each do |other|
         (@filters.methods - Object.methods).each do |method|
@@ -790,15 +789,12 @@ class StandardFiltersTest < Minitest::Test
           inputs << ([other] * (arg_count - 1)) if arg_count > 1
           begin
             @filters.send(method, *inputs)
-          rescue Liquid::ArgumentError => e
-            errors << "#{method} returned #{e.message}"
-          rescue Liquid::ZeroDivisionError => e
-            errors << "#{method} returned #{e.message}"
+          rescue Liquid::ArgumentError, Liquid::ZeroDivisionError
+            nil
           end
         end
       end
     end
-    errors
   end
 
   def test_where_no_target_value