Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assertpy/extracting.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def _filter(x):
return True
elif callable(kwargs['filter']):
return kwargs['filter'](x)
return False
return kwargs['filter'] is None
return True

def _sort(x):
Expand Down
8 changes: 8 additions & 0 deletions tests/test_extracting.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ def test_extracting_filter():
assert_that(users).extracting('user', filter=lambda x: x['age'] < 10).is_empty()


def test_extracting_filter_none():
assert_that(users).extracting('user', filter=None).is_equal_to(['Fred', 'Bob', 'Johnny'])


def test_extracting_filter_bad_type():
assert_that(users).extracting('user', filter=123).is_equal_to([])

Expand Down Expand Up @@ -231,6 +235,10 @@ def test_extracting_sort():
assert_that(users).extracting('user', sort=lambda x: -x['age']).is_equal_to(['Bob', 'Fred', 'Johnny'])


def test_extracting_sort_none():
assert_that(users).extracting('user', sort=None).is_equal_to(['Fred', 'Bob', 'Johnny'])


def test_extracting_sort_ignore_bad_type():
assert_that(users).extracting('user', sort=123).is_equal_to(['Fred', 'Bob', 'Johnny'])

Expand Down