dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3520 from delftswa2014/sort-null

This commit is contained in:
Matt Rogers 2015-03-05 14:35:40 -06:00
parent 2185339ee0 92a9582733
commit 02e98f238e
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/jekyll/filters.rb
View File

@ -222,6 +222,9 @@ module Jekyll
# #
# Returns the filtered array of objects # Returns the filtered array of objects
def sort(input, property = nil, nils = "first") def sort(input, property = nil, nils = "first")
if input.nil?
raise ArgumentError.new("Cannot sort a null object.")
end
if property.nil? if property.nil?
input.sort input.sort
else else

6
test/test_filters.rb
View File

@ -280,6 +280,12 @@ class TestFilters < JekyllUnitTest
end end
context "sort filter" do context "sort filter" do
should "raise Exception when input is nil" do
err = assert_raises ArgumentError do
@filter.sort(nil)
end
assert_equal "Cannot sort a null object.", err.message
end
should "return sorted numbers" do should "return sorted numbers" do
assert_equal [1, 2, 2.2, 3], @filter.sort([3, 2.2, 2, 1]) assert_equal [1, 2, 2.2, 3], @filter.sort([3, 2.2, 2, 1])
end end