[#3191] tests for ckan.search.default_include_private

ckan · Aug 12, 2016 · 7eac86a · 7eac86a
1 parent a27711e
commit 7eac86a
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 1 deletion.
diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
@@ -1836,7 +1836,7 @@ def package_search(context, data_dict):
             capacity_fq = None
         elif include_private and user:
             orgs = logic.get_action('organization_list_for_user')(
-                {'user': user}, {'permission': 'member'})
+                {'user': user}, {'permission': 'read'})
             if orgs:
                 capacity_fq = '({0} OR owner_org:({1}))'.format(
                     capacity_fq,

diff --git a/ckan/tests/controllers/test_package.py b/ckan/tests/controllers/test_package.py
@@ -1487,6 +1487,64 @@ def test_search_page_results_private(self):
         assert_true('Dataset Two' in ds_titles)
         assert_true('Dataset Three' in ds_titles)
 
+    def test_user_not_in_organization_cannot_search_private_datasets(self):
+        app = helpers._get_test_app()
+        user = factories.User()
+        organization = factories.Organization()
+        dataset = factories.Dataset(
+            owner_org=organization['id'],
+            private=True,
+        )
+        env = {'REMOTE_USER': user['name'].encode('ascii')}
+        search_url = url_for(controller='package', action='search')
+        search_response = app.get(search_url, extra_environ=env)
+
+        search_response_html = BeautifulSoup(search_response.body)
+        ds_titles = search_response_html.select('.dataset-list '
+                                                '.dataset-item '
+                                                '.dataset-heading a')
+        assert_equal([n.string for n in ds_titles], [])
+
+    def test_user_in_organization_can_search_private_datasets(self):
+        app = helpers._get_test_app()
+        user = factories.User()
+        organization = factories.Organization(
+            users=[{'name': user['id'], 'capacity': 'member'}])
+        dataset = factories.Dataset(
+            title='A private dataset',
+            owner_org=organization['id'],
+            private=True,
+        )
+        env = {'REMOTE_USER': user['name'].encode('ascii')}
+        search_url = url_for(controller='package', action='search')
+        search_response = app.get(search_url, extra_environ=env)
+
+        search_response_html = BeautifulSoup(search_response.body)
+        ds_titles = search_response_html.select('.dataset-list '
+                                                '.dataset-item '
+                                                '.dataset-heading a')
+        assert_equal([n.string for n in ds_titles], ['A private dataset'])
+
+    @helpers.change_config('ckan.search.default_include_private', 'false')
+    def test_search_default_include_private_false(self):
+        app = helpers._get_test_app()
+        user = factories.User()
+        organization = factories.Organization(
+            users=[{'name': user['id'], 'capacity': 'member'}])
+        dataset = factories.Dataset(
+            owner_org=organization['id'],
+            private=True,
+        )
+        env = {'REMOTE_USER': user['name'].encode('ascii')}
+        search_url = url_for(controller='package', action='search')
+        search_response = app.get(search_url, extra_environ=env)
+
+        search_response_html = BeautifulSoup(search_response.body)
+        ds_titles = search_response_html.select('.dataset-list '
+                                                '.dataset-item '
+                                                '.dataset-heading a')
+        assert_equal([n.string for n in ds_titles], [])
+
 
 class TestPackageFollow(helpers.FunctionalTestBase):