More cleanup.

Author: ericholscher

readthedocs/search/documents.py

@@ -66,12 +66,14 @@ class Meta(object):
         ignore_signals = True
 
     @classmethod
-    def faceted_search(cls, query, user, projects_list=None, versions_list=None, filter_user=True):
+    def faceted_search(
+        cls, query, user, projects_list=None, versions_list=None, filter_by_user=True
+    ):
         from readthedocs.search.faceted_search import PageSearch
         kwargs = {
             'user': user,
             'query': query,
-            'filter_user': filter_user,
+            'filter_by_user': filter_by_user,
         }
 
         filters = {}

readthedocs/search/faceted_search.py

@@ -21,7 +21,7 @@ def __init__(self, user, **kwargs):
             but is used on the .com
         """
         self.user = user
-        self.filter_by_user = kwargs.pop('filter_by_user')
+        self.filter_by_user = kwargs.pop('filter_by_user', None)
         super().__init__(**kwargs)
 
     def query(self, search, query):

readthedocs/search/tests/test_views.py

@@ -230,7 +230,12 @@ def test_file_search_show_versions(self, client, all_projects, es_index, setting
         assert sorted(project_versions) == sorted(content_versions)
 
     def test_file_search_subprojects(self, client, all_projects, es_index):
-        """File search should return results from subprojects also."""
+        """
+        TODO: File search should return results from subprojects also.
+
+        This is currently disabled because the UX around it is weird.
+        You filter by a project, and get results for multiple.
+        """
         project = all_projects[0]
         subproject = all_projects[1]
         # Add another project as subproject of the project
@@ -244,4 +249,4 @@ def test_file_search_subprojects(self, client, all_projects, es_index):
             search_params=search_params,
         )
 
-        assert len(result) == 1
+        assert len(result) == 0