matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SearchModel no longer returns result_set. It is unfiltered and unused.

Browse Source 
Signed-off-by: Michael Price <loneviking72@gmail.com>
This commit is contained in:
Michael Price
2018-04-01 18:38:53 -04:00
committed by Roberto Rosario
parent d93fafcf57
commit 702618b924
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/dynamic_search/tests/test_models.py
+9 -9
View File
@@ -31,24 +31,24 @@ class DocumentSearchTestCase(BaseTestCase):
document versions and document version pages
"""
model_list, result_set, elapsed_time = document_search.search(
queryset, elapsed_time = document_search.search(
{'q': 'Mayan'}, user=self.admin_user
)
self.assertEqual(len(result_set), 1)
self.assertEqual(list(model_list), [self.document])
self.assertEqual(queryset.count(), 1)
self.assertTrue(self.document in queryset)
def test_advanced_search_after_related_name_change(self):
# Test versions__filename
model_list, result_set, elapsed_time = document_search.search(
queryset, elapsed_time = document_search.search(
{'label': self.document.label}, user=self.admin_user
)
self.assertEqual(len(result_set), 1)
self.assertEqual(list(model_list), [self.document])
self.assertEqual(queryset.count(), 1)
self.assertTrue(self.document in queryset)
# Test versions__mimetype
model_list, result_set, elapsed_time = document_search.search(
queryset, elapsed_time = document_search.search(
{'versions__mimetype': self.document.file_mimetype},
user=self.admin_user
)
self.assertEqual(len(result_set), 1)
self.assertEqual(list(model_list), [self.document])
self.assertEqual(queryset.count(), 1)
self.assertTrue(self.document in queryset)