mirror of
https://github.com/Shopify/liquid.git
synced 2026-09-12 23:40:45 -07:00
Merge pull request #1760 from mtasaka/nil-nil-comparison-fix
change: make nil_safe_casecmp judge compatible for nil-nil comparison
This commit is contained in:
@@ -944,6 +944,8 @@ module Liquid
|
|||||||
def nil_safe_casecmp(a, b)
|
def nil_safe_casecmp(a, b)
|
||||||
if !a.nil? && !b.nil?
|
if !a.nil? && !b.nil?
|
||||||
a.to_s.casecmp(b.to_s)
|
a.to_s.casecmp(b.to_s)
|
||||||
|
elsif a.nil? && b.nil?
|
||||||
|
0
|
||||||
else
|
else
|
||||||
a.nil? ? 1 : -1
|
a.nil? ? 1 : -1
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -331,8 +331,8 @@ class StandardFiltersTest < Minitest::Test
|
|||||||
{ "price" => "1", "handle" => "gamma" },
|
{ "price" => "1", "handle" => "gamma" },
|
||||||
{ "price" => 2, "handle" => "epsilon" },
|
{ "price" => 2, "handle" => "epsilon" },
|
||||||
{ "price" => "4", "handle" => "alpha" },
|
{ "price" => "4", "handle" => "alpha" },
|
||||||
{ "handle" => "delta" },
|
|
||||||
{ "handle" => "beta" },
|
{ "handle" => "beta" },
|
||||||
|
{ "handle" => "delta" },
|
||||||
]
|
]
|
||||||
assert_equal(expectation, @filters.sort_natural(input, "price"))
|
assert_equal(expectation, @filters.sort_natural(input, "price"))
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user