From 282d42f98d03d8bdedc1f4964c46be13ba0d98f4 Mon Sep 17 00:00:00 2001
From: Thibaut Courouble <thibaut@me.com>
Date: Wed, 6 Dec 2017 08:58:05 -0500
Subject: [PATCH] Fix min/max filters

---
 lib/liquid/standardfilters.rb            |  4 +--
 test/integration/standard_filter_test.rb | 32 ++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/liquid/standardfilters.rb b/lib/liquid/standardfilters.rb
index 5519631..e8b19e0 100644
--- a/lib/liquid/standardfilters.rb
+++ b/lib/liquid/standardfilters.rb
@@ -357,7 +357,7 @@ module Liquid
       max_value = Utils.to_number(n)
 
       result = Utils.to_number(input)
-      result = max_value if result > max_value
+      result = max_value if max_value > result
       result.is_a?(BigDecimal) ? result.to_f : result
     end
 
@@ -365,7 +365,7 @@ module Liquid
       min_value = Utils.to_number(n)
 
       result = Utils.to_number(input)
-      result = min_value if result < min_value
+      result = min_value if min_value < result
       result.is_a?(BigDecimal) ? result.to_f : result
     end
 
diff --git a/test/integration/standard_filter_test.rb b/test/integration/standard_filter_test.rb
index 028e5b6..d3b64f9 100644
--- a/test/integration/standard_filter_test.rb
+++ b/test/integration/standard_filter_test.rb
@@ -496,26 +496,26 @@ class StandardFiltersTest < Minitest::Test
     assert_template_result "5", "{{ price | floor }}", 'price' => NumberLikeThing.new(5.4)
   end
 
-  def test_max
-    assert_template_result "4", "{{ 5 | max:4 }}"
-    assert_template_result "5", "{{ 5 | max:5 }}"
-    assert_template_result "5", "{{ 5 | max:6 }}"
+  def test_min
+    assert_template_result "4", "{{ 5 | min:4 }}"
+    assert_template_result "5", "{{ 5 | min:5 }}"
+    assert_template_result "5", "{{ 5 | min:6 }}"
 
-    assert_template_result "4.5", "{{ 4.5 | max:5 }}"
-    assert_template_result "5", "{{ width | max:5 }}", 'width' => NumberLikeThing.new(6)
-    assert_template_result "4", "{{ width | max:5 }}", 'width' => NumberLikeThing.new(4)
-    assert_template_result "4", "{{ 5 | max: width }}", 'width' => NumberLikeThing.new(4)
+    assert_template_result "4.5", "{{ 4.5 | min:5 }}"
+    assert_template_result "5", "{{ width | min:5 }}", 'width' => NumberLikeThing.new(6)
+    assert_template_result "4", "{{ width | min:5 }}", 'width' => NumberLikeThing.new(4)
+    assert_template_result "4", "{{ 5 | min: width }}", 'width' => NumberLikeThing.new(4)
   end
 
-  def test_min
-    assert_template_result "5", "{{ 5 | min:4 }}"
-    assert_template_result "5", "{{ 5 | min:5 }}"
-    assert_template_result "6", "{{ 5 | min:6 }}"
+  def test_max
+    assert_template_result "5", "{{ 5 | max:4 }}"
+    assert_template_result "5", "{{ 5 | max:5 }}"
+    assert_template_result "6", "{{ 5 | max:6 }}"
 
-    assert_template_result "5", "{{ 4.5 | min:5 }}"
-    assert_template_result "6", "{{ width | min:5 }}", 'width' => NumberLikeThing.new(6)
-    assert_template_result "5", "{{ width | min:5 }}", 'width' => NumberLikeThing.new(4)
-    assert_template_result "6", "{{ 5 | min: width }}", 'width' => NumberLikeThing.new(6)
+    assert_template_result "5", "{{ 4.5 | max:5 }}"
+    assert_template_result "6", "{{ width | max:5 }}", 'width' => NumberLikeThing.new(6)
+    assert_template_result "5", "{{ width | max:5 }}", 'width' => NumberLikeThing.new(4)
+    assert_template_result "6", "{{ 5 | max: width }}", 'width' => NumberLikeThing.new(6)
   end
 
   def test_append