udata 7.0.6__py2.py3-none-any.whl → 7.0.6.dev28209__py2.py3-none-any.whl

udata/harvest/tests/test_dcat_backend.py

@@ -1,22 +1,21 @@
-from datetime import date
 import logging
 import os
-import re
+from flask import current_app
 
 import pytest
 
+from datetime import date
 import boto3
-from flask import current_app
 import xml.etree.ElementTree as ET
-
 from udata.harvest.models import HarvestJob
+
 from udata.models import Dataset
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.dataset.factories import LicenseFactory, ResourceSchemaMockData
 from udata.storage.s3 import get_from_json
 
 from .factories import HarvestSourceFactory
-from ..backends.dcat import URIS_TO_REPLACE, CswIso19139DcatBackend
+from ..backends.dcat import URIS_TO_REPLACE
 from .. import actions
 
 log = logging.getLogger(__name__)
@@ -161,21 +160,6 @@ class DcatBackendTest:
         assert len(datasets['1'].resources) == 2
         assert len(datasets['2'].resources) == 2
 
-    def test_harvest_literal_spatial(self, rmock):
-        url = mock_dcat(rmock, 'evian.json')
-        org = OrganizationFactory()
-        source = HarvestSourceFactory(backend='dcat',
-                                      url=url,
-                                      organization=org)
-        
-        actions.run(source.slug)
-
-        datasets = {d.harvest.dct_identifier: d for d in Dataset.objects}
-        assert len(datasets) == 8
-        assert datasets['https://www.arcgis.com/home/item.html?id=f6565516d1354383b25793e630cf3f2b&sublayer=5'].spatial is not None
-        assert datasets['https://www.arcgis.com/home/item.html?id=f6565516d1354383b25793e630cf3f2b&sublayer=5'].spatial.geom == {'type': 'MultiPolygon', 'coordinates': [[[[6.5735, 46.3912], [6.6069, 46.3912], [6.6069, 46.4028], [6.5735, 46.4028], [6.5735, 46.3912]]]]}
-
-
     @pytest.mark.skip(reason="Mocking S3 requires `moto` which is not available for our current Python 3.7. We can manually test it.")
     @pytest.mark.options(SCHEMA_CATALOG_URL='https://example.com/schemas', HARVEST_JOBS_RETENTION_DAYS=0)
     # @mock_s3
@@ -630,7 +614,7 @@ class DcatBackendTest:
 
 
 @pytest.mark.usefixtures('clean_db')
-@pytest.mark.options(PLUGINS=['csw'])
+@pytest.mark.options(PLUGINS=['csw-dcat'])
 class CswDcatBackendTest:
 
     def test_geonetworkv4(self, rmock):
@@ -678,60 +662,3 @@ class CswDcatBackendTest:
 
         assert 'User-Agent' in get_mock.last_request.headers
         assert get_mock.last_request.headers['User-Agent'] == 'uData/0.1 csw-dcat'
-
-
-@pytest.mark.usefixtures('clean_db')
-@pytest.mark.options(PLUGINS=['csw'])
-class CswIso19139DcatBackendTest:
-
-    def test_geo2france(self, rmock):
-
-        with open(os.path.join(CSW_DCAT_FILES_DIR, "XSLT.xml"), "r") as f:
-            xslt = f.read()
-        url = mock_csw_pagination(rmock, 'geonetwork/srv/eng/csw.rdf', 'geonetwork-iso-page-{}.xml')
-        rmock.get(CswIso19139DcatBackend.XSL_URL, text=xslt)
-        org = OrganizationFactory()
-        source = HarvestSourceFactory(backend='csw-iso-19139',
-                                      url=url,
-                                      organization=org)
-
-        actions.run(source.slug)
-
-        source.reload()
-
-        job = source.get_last_job()
-        assert len(job.items) == 6
-
-        datasets = {d.harvest.dct_identifier: d for d in Dataset.objects}
-
-        assert len(datasets) == 6
-
-        # First dataset
-        # dataset identifier is gmd:RS_Identifier > gmd:codeSpace + gmd:code
-        dataset = datasets['http://catalogue.geo-ide.developpement-durable.gouv.fr/fr-120066022-orphan-residentifier-140d31c6-643d-42a9-85df-2737a118e144']
-        assert dataset.title == "Plan local d'urbanisme de la commune de Cartigny"
-        assert dataset.description == "Le présent standard de données COVADIS concerne les documents de plans locaux d'urbanisme (PLU) et les plans d'occupation des sols (POS qui valent PLU)."
-        assert set(dataset.tags) == set([
-            'amenagement-urbanisme-zonages-planification', 'cartigny',
-            'document-durbanisme', 'donnees-ouvertes', 'plu', 'usage-des-sols'
-        ])
-        assert dataset.harvest.created_at.date() == date(2017, 10, 7)
-        assert dataset.spatial.geom == {'type': 'MultiPolygon', 'coordinates':
-            [[[[3.28133559, 50.48188019], [1.31279111, 50.48188019], [1.31279111, 49.38547516], [3.28133559, 49.38547516], [3.28133559, 50.48188019]]]]
-        }
-        assert dataset.contact_point.name == 'DDTM 80 (Direction Départementale des Territoires et de la Mer de la Somme)'
-        assert dataset.contact_point.email == 'ddtm-sap-bsig@somme.gouv.fr'
-
-        # License is not properly mapped in XSLT conversion
-        assert dataset.license is None
-
-        # Distributions don't get properly mapped to distribution with this XSLT if missing CI_OnLineFunctionCode.
-        # A CI_OnLineFunctionCode was added explicitely on one of the Online Resources.
-        # (See mapping at: https://semiceu.github.io/GeoDCAT-AP/releases/2.0.0/#resource-locator---on-line-resource)
-        assert len(dataset.resources) == 1
-        resource = dataset.resources[0]
-        assert resource.title == 'Téléchargement direct du lot et des documents associés'
-        assert resource.url == 'http://atom.geo-ide.developpement-durable.gouv.fr/atomArchive/GetResource?id=fr-120066022-ldd-cab63273-b3ae-4e8a-ae1c-6192e45faa94&datasetAggregate=true'
-        
-        # Sadly resource format is parsed as a blank node. Format parsing should be improved.
-        assert re.match(r'n[0-9a-f]{32}', resource.format)

udata/rdf.py

@@ -76,7 +76,6 @@ ACCEPTED_MIME_TYPES = {
     'application/ld+json': 'json-ld',
     'application/json': 'json-ld',
     'application/trig': 'trig',
-    'text/xml': 'xml',
     # Available but not activated
     # 'application/n-quads': 'nquads',
     # 'text/xml': 'trix',

udata/search/__init__.py

@@ -24,7 +24,7 @@ def reindex(classname, id):
     document = adapter_class.serialize(obj)
     if adapter_class.is_indexable(obj):
         log.info('Indexing %s (%s)', model.__name__, obj.id)
-        url = f"{current_app.config['SEARCH_SERVICE_API_URL']}{adapter_class.search_url}index"
+        url = f"{current_app.config['SEARCH_SERVICE_API_URL']}{adapter_class.search_url}/index"
         try:
             payload = {
                 'document': document
@@ -35,7 +35,7 @@ def reindex(classname, id):
             log.exception('Unable to index/unindex %s "%s"', model.__name__, str(obj.id))
     else:
         log.info('Unindexing %s (%s)', model.__name__, obj.id)
-        url = f"{current_app.config['SEARCH_SERVICE_API_URL']}{adapter_class.search_url}{str(obj.id)}/unindex"
+        url = f"{current_app.config['SEARCH_SERVICE_API_URL']}{adapter_class.search_url}/{str(obj.id)}/unindex"
         try:
             r = requests.delete(url)
             if r.status_code == 404:

udata/tests/api/test_datasets_api.py

@@ -17,7 +17,7 @@ from udata.core.dataset.api_fields import (dataset_harvest_fields,
 from udata.core.dataset.factories import (CommunityResourceFactory,
                                           DatasetFactory, LicenseFactory,
                                           ResourceFactory, ResourceSchemaMockData,
-                                          HiddenDatasetFactory)
+                                          VisibleDatasetFactory)
 from udata.core.dataset.models import (HarvestDatasetMetadata,
                                        HarvestResourceMetadata, ResourceMixin)
 from udata.core.organization.factories import OrganizationFactory
@@ -44,13 +44,12 @@ SAMPLE_GEOM = {
     ]
 }
 
-
 class DatasetAPITest(APITestCase):
     modules = []
 
     def test_dataset_api_list(self):
         '''It should fetch a dataset list from the API'''
-        datasets = [DatasetFactory() for i in range(2)]
+        datasets = [VisibleDatasetFactory() for i in range(2)]
 
         response = self.get(url_for('api.datasets'))
         self.assert200(response)
@@ -59,10 +58,10 @@ class DatasetAPITest(APITestCase):
 
     def test_dataset_api_full_text_search(self):
         '''Should proceed to full text search on datasets'''
-        [DatasetFactory() for i in range(2)]
-        DatasetFactory(title="some spécial integer")
-        DatasetFactory(title="some spécial float")
-        dataset = DatasetFactory(title="some spécial chars")
+        [VisibleDatasetFactory() for i in range(2)]
+        VisibleDatasetFactory(title="some spécial integer")
+        VisibleDatasetFactory(title="some spécial float")
+        dataset = VisibleDatasetFactory(title="some spécial chars")
 
         # with accent
         response = self.get(url_for('api.datasets', q='some spécial chars'))
@@ -83,9 +82,9 @@ class DatasetAPITest(APITestCase):
     def test_dataset_api_sorting(self):
         '''Should sort datasets results from the API'''
         self.login()
-        [DatasetFactory() for i in range(2)]
+        [VisibleDatasetFactory() for i in range(2)]
 
-        to_follow = DatasetFactory(title="dataset to follow")
+        to_follow = VisibleDatasetFactory(title="dataset to follow")
 
         response = self.post(url_for('api.dataset_followers', id=to_follow.id))
         self.assert201(response)
@@ -101,8 +100,8 @@ class DatasetAPITest(APITestCase):
 
     def test_dataset_api_sorting_created(self):
         self.login()
-        first = DatasetFactory(title="first created dataset")
-        second = DatasetFactory(title="second created dataset")
+        first = VisibleDatasetFactory(title="first created dataset")
+        second = VisibleDatasetFactory(title="second created dataset")
         response = self.get(url_for('api.datasets', sort='created'))
         self.assert200(response)
         self.assertEqual(response.json['data'][0]['id'], str(first.id))
@@ -124,8 +123,8 @@ class DatasetAPITest(APITestCase):
     def test_dataset_api_default_sorting(self):
         # Default sort should be -created
         self.login()
-        [DatasetFactory(title="some created dataset") for i in range(10)]
-        last = DatasetFactory(title="last created dataset")
+        [VisibleDatasetFactory(title="some created dataset") for i in range(10)]
+        last = VisibleDatasetFactory(title="last created dataset")
         response = self.get(url_for('api.datasets'))
         self.assert200(response)
         self.assertEqual(response.json['data'][0]['id'], str(last.id))
@@ -135,31 +134,31 @@ class DatasetAPITest(APITestCase):
         owner = UserFactory()
         org = OrganizationFactory()
 
-        [DatasetFactory() for i in range(2)]
+        [VisibleDatasetFactory() for i in range(2)]
 
-        tag_dataset = DatasetFactory(tags=['my-tag', 'other'])
-        license_dataset = DatasetFactory(license=LicenseFactory(id='cc-by'))
+        tag_dataset = VisibleDatasetFactory(tags=['my-tag', 'other'])
+        license_dataset = VisibleDatasetFactory(license=LicenseFactory(id='cc-by'))
         format_dataset = DatasetFactory(resources=[ResourceFactory(format='my-format')])
-        featured_dataset = DatasetFactory(featured=True)
-        topic_dataset = DatasetFactory()
+        featured_dataset = VisibleDatasetFactory(featured=True)
+        topic_dataset = VisibleDatasetFactory()
         topic = TopicFactory(datasets=[topic_dataset])
 
         paca, _, _ = create_geozones_fixtures()
-        geozone_dataset = DatasetFactory(spatial=SpatialCoverageFactory(zones=[paca.id]))
-        granularity_dataset = DatasetFactory(
+        geozone_dataset = VisibleDatasetFactory(spatial=SpatialCoverageFactory(zones=[paca.id]))
+        granularity_dataset = VisibleDatasetFactory(
             spatial=SpatialCoverageFactory(granularity='country')
         )
 
         temporal_coverage = db.DateRange(start='2022-05-03', end='2022-05-04')
         temporal_coverage_dataset = DatasetFactory(temporal_coverage=temporal_coverage)
 
-        owner_dataset = DatasetFactory(owner=owner)
-        org_dataset = DatasetFactory(organization=org)
+        owner_dataset = VisibleDatasetFactory(owner=owner)
+        org_dataset = VisibleDatasetFactory(organization=org)
 
-        schema_dataset = DatasetFactory(resources=[
+        schema_dataset = VisibleDatasetFactory(resources=[
             ResourceFactory(schema={'name': 'my-schema', 'url': 'https://example.org', 'version': '1.0.0'})
         ])
-        schema_version2_dataset = DatasetFactory(resources=[
+        schema_version2_dataset = VisibleDatasetFactory(resources=[
             ResourceFactory(schema={'name': 'other-schema', 'url': 'https://example.org', 'version': '2.0.0'})
         ])
 
@@ -271,7 +270,7 @@ class DatasetAPITest(APITestCase):
 
     def test_dataset_api_get_deleted(self):
         '''It should not fetch a deleted dataset from the API and raise 410'''
-        dataset = DatasetFactory(deleted=datetime.utcnow())
+        dataset = VisibleDatasetFactory(deleted=datetime.utcnow())
 
         response = self.get(url_for('api.dataset', dataset=dataset))
         self.assert410(response)
@@ -279,7 +278,7 @@ class DatasetAPITest(APITestCase):
     def test_dataset_api_get_deleted_but_authorized(self):
         '''It should a deleted dataset from the API if user is authorized'''
         self.login()
-        dataset = DatasetFactory(owner=self.user,
+        dataset = VisibleDatasetFactory(owner=self.user,
                                         deleted=datetime.utcnow())
 
         response = self.get(url_for('api.dataset', dataset=dataset))
@@ -452,7 +451,7 @@ class DatasetAPITest(APITestCase):
     def test_dataset_api_update_with_resources(self):
         '''It should update a dataset from the API with resources parameters'''
         user = self.login()
-        dataset = DatasetFactory(owner=user)
+        dataset = VisibleDatasetFactory(owner=user)
         initial_length = len(dataset.resources)
         data = dataset.to_dict()
         data['resources'].append(ResourceFactory.as_dict())
@@ -465,7 +464,7 @@ class DatasetAPITest(APITestCase):
 
     def test_dataset_api_update_private(self):
         user = self.login()
-        dataset = HiddenDatasetFactory(owner=user)
+        dataset = DatasetFactory(owner=user, private=True)
         data = dataset.to_dict()
         data['description'] = 'new description'
         del data['private']
@@ -488,10 +487,12 @@ class DatasetAPITest(APITestCase):
         dataset.reload()
         self.assertEqual(dataset.private, True)
 
+
+
     def test_dataset_api_update_new_resource_with_extras(self):
         '''It should update a dataset with a new resource with extras'''
         user = self.login()
-        dataset = DatasetFactory(owner=user)
+        dataset = VisibleDatasetFactory(owner=user)
         data = dataset.to_dict()
         resource_data = ResourceFactory.as_dict()
         resource_data['extras'] = {'extra:id': 'id'}
@@ -507,7 +508,7 @@ class DatasetAPITest(APITestCase):
     def test_dataset_api_update_existing_resource_with_extras(self):
         '''It should update a dataset's existing resource with extras'''
         user = self.login()
-        dataset = DatasetFactory(owner=user, nb_resources=1)
+        dataset = VisibleDatasetFactory(owner=user)
         data = dataset.to_dict()
         data['resources'][0]['extras'] = {'extra:id': 'id'}
         response = self.put(url_for('api.dataset', dataset=dataset), data)
@@ -682,7 +683,7 @@ class DatasetAPITest(APITestCase):
     def test_dataset_api_delete(self):
         '''It should delete a dataset from the API'''
         user = self.login()
-        dataset = DatasetFactory(owner=user, nb_resources=1)
+        dataset = VisibleDatasetFactory(owner=user)
         response = self.delete(url_for('api.dataset', dataset=dataset))
 
         self.assertStatus(response, 204)
@@ -696,7 +697,7 @@ class DatasetAPITest(APITestCase):
     def test_dataset_api_delete_deleted(self):
         '''It should delete a deleted dataset from the API and raise 410'''
         user = self.login()
-        dataset = DatasetFactory(owner=user, deleted=datetime.utcnow(), nb_resources=1)
+        dataset = VisibleDatasetFactory(owner=user, deleted=datetime.utcnow())
         response = self.delete(url_for('api.dataset', dataset=dataset))
 
         self.assert410(response)
@@ -1471,8 +1472,8 @@ class DatasetArchivedAPITest(APITestCase):
 
     def test_dataset_api_search_archived(self):
         '''It should search datasets from the API, excluding archived ones'''
-        DatasetFactory(archived=None)
-        dataset = DatasetFactory(archived=datetime.utcnow())
+        VisibleDatasetFactory(archived=None)
+        dataset = VisibleDatasetFactory(archived=datetime.utcnow())
 
         response = self.get(url_for('api.datasets', q=''))
         self.assert200(response)
@@ -1482,7 +1483,7 @@ class DatasetArchivedAPITest(APITestCase):
 
     def test_dataset_api_get_archived(self):
         '''It should fetch an archived dataset from the API and return 200'''
-        dataset = DatasetFactory(archived=datetime.utcnow())
+        dataset = VisibleDatasetFactory(archived=datetime.utcnow())
         response = self.get(url_for('api.dataset', dataset=dataset))
         self.assert200(response)
 
@@ -1527,7 +1528,7 @@ class CommunityResourceAPITest(APITestCase):
 
     def test_community_resource_api_create_dataset_binding(self):
         '''It should create a community resource linked to the right dataset'''
-        dataset = DatasetFactory()
+        dataset = VisibleDatasetFactory()
         self.login()
         response = self.post(
             url_for('api.upload_new_community_resource', dataset=dataset),
@@ -1539,7 +1540,7 @@ class CommunityResourceAPITest(APITestCase):
 
     def test_community_resource_api_create(self):
         '''It should create a community resource from the API'''
-        dataset = DatasetFactory()
+        dataset = VisibleDatasetFactory()
         self.login()
         response = self.post(
             url_for('api.upload_new_community_resource', dataset=dataset),
@@ -1559,7 +1560,7 @@ class CommunityResourceAPITest(APITestCase):
 
     def test_community_resource_api_create_as_org(self):
         '''It should create a community resource as org from the API'''
-        dataset = DatasetFactory()
+        dataset = VisibleDatasetFactory()
         user = self.login()
         org = OrganizationFactory(members=[
             Member(user=user, role='admin')
@@ -1611,7 +1612,7 @@ class CommunityResourceAPITest(APITestCase):
 
     def test_community_resource_api_update_with_file(self):
         '''It should update a community resource file from the API'''
-        dataset = DatasetFactory()
+        dataset = VisibleDatasetFactory()
         user = self.login()
         community_resource = CommunityResourceFactory(dataset=dataset,
                                                       owner=user)
@@ -1636,7 +1637,7 @@ class CommunityResourceAPITest(APITestCase):
 
     def test_community_resource_file_update_old_file_deletion(self):
         '''It should update a community resource's file and delete the old one'''
-        dataset = DatasetFactory()
+        dataset = VisibleDatasetFactory()
         user = self.login()
         community_resource = CommunityResourceFactory(dataset=dataset,
                                                       owner=user)
@@ -1663,7 +1664,7 @@ class CommunityResourceAPITest(APITestCase):
     def test_community_resource_api_create_remote(self):
         '''It should create a remote community resource from the API'''
         user = self.login()
-        dataset = DatasetFactory()
+        dataset = VisibleDatasetFactory()
         attrs = CommunityResourceFactory.as_dict()
         attrs['filetype'] = 'remote'
         attrs['dataset'] = str(dataset.id)
@@ -1684,7 +1685,7 @@ class CommunityResourceAPITest(APITestCase):
     def test_community_resource_api_unallowed_create_filetype_file(self):
         '''It should create a remote community resource from the API'''
         self.login()
-        dataset = DatasetFactory()
+        dataset = VisibleDatasetFactory()
         attrs = CommunityResourceFactory.as_dict()
         attrs['filetype'] = 'file'  # to be explicit
         attrs['dataset'] = str(dataset.id)
@@ -1733,7 +1734,7 @@ class CommunityResourceAPITest(APITestCase):
         self.assertEqual(CommunityResource.objects.count(), 0)
 
     def test_community_resource_api_delete(self):
-        dataset = DatasetFactory()
+        dataset = VisibleDatasetFactory()
         self.login()
 
         response = self.post(
@@ -1790,8 +1791,7 @@ class DatasetSchemasAPITest:
         assert response.json == []
 
     @pytest.mark.options(SCHEMA_CATALOG_URL='https://example.com/notfound')
-    def test_dataset_schemas_api_list_not_found(self, api, rmock):
-        rmock.get('https://example.com/notfound', status_code=404)
+    def test_dataset_schemas_api_list_not_found(self, api):
         response = api.get(url_for('api.schemas'))
         assert404(response)
 

udata/tests/api/test_me_api.py

@@ -6,7 +6,8 @@ from udata.models import Discussion, Follow, Member, User
 from udata.core.discussions.models import Message as DiscMsg
 from udata.core.dataset.factories import (
     CommunityResourceFactory,
-    DatasetFactory
+    DatasetFactory,
+    VisibleDatasetFactory,
 )
 from udata.core.dataset.activities import UserCreatedDataset
 from udata.core.discussions.factories import DiscussionFactory
@@ -88,9 +89,9 @@ class MeAPITest(APITestCase):
         member = Member(user=user, role='editor')
         organization = OrganizationFactory(members=[member])
         community_resources = [
-            DatasetFactory(owner=user) for _ in range(2)]
+            VisibleDatasetFactory(owner=user) for _ in range(2)]
         org_datasets = [
-            DatasetFactory(organization=organization)
+            VisibleDatasetFactory(organization=organization)
             for _ in range(2)]
 
         response = self.get(url_for('api.my_org_datasets'))
@@ -104,15 +105,15 @@ class MeAPITest(APITestCase):
         member = Member(user=user, role='editor')
         organization = OrganizationFactory(members=[member])
         datasets = [
-            DatasetFactory(owner=user, title='foô'),
+            VisibleDatasetFactory(owner=user, title='foô'),
         ]
         org_datasets = [
-            DatasetFactory(organization=organization, title='foô'),
+            VisibleDatasetFactory(organization=organization, title='foô'),
         ]
 
         # Should not be listed.
-        DatasetFactory(owner=user)
-        DatasetFactory(organization=organization)
+        VisibleDatasetFactory(owner=user)
+        VisibleDatasetFactory(organization=organization)
 
         response = self.get(url_for('api.my_org_datasets'),
                             qs={'q': 'foô'})
@@ -194,8 +195,8 @@ class MeAPITest(APITestCase):
         organization = OrganizationFactory(members=[member])
         reuse = ReuseFactory(owner=user)
         org_reuse = ReuseFactory(organization=organization)
-        dataset = DatasetFactory(owner=user)
-        org_dataset = DatasetFactory(organization=organization)
+        dataset = VisibleDatasetFactory(owner=user)
+        org_dataset = VisibleDatasetFactory(organization=organization)
 
         discussions = [
             Discussion.objects.create(subject=dataset, title='', user=user),
@@ -205,7 +206,7 @@ class MeAPITest(APITestCase):
         ]
 
         # Should not be listed
-        Discussion.objects.create(subject=DatasetFactory(), title='', user=user)
+        Discussion.objects.create(subject=VisibleDatasetFactory(), title='', user=user)
         Discussion.objects.create(subject=ReuseFactory(), title='', user=user)
 
         response = self.get(url_for('api.my_org_discussions'))
@@ -218,8 +219,8 @@ class MeAPITest(APITestCase):
         organization = OrganizationFactory(members=[member])
         reuse = ReuseFactory(owner=user)
         org_reuse = ReuseFactory(organization=organization)
-        dataset = DatasetFactory(owner=user)
-        org_dataset = DatasetFactory(organization=organization)
+        dataset = VisibleDatasetFactory(owner=user)
+        org_dataset = VisibleDatasetFactory(organization=organization)
 
         discussions = [
             Discussion.objects.create(subject=dataset, title='foô', user=user),
@@ -231,7 +232,7 @@ class MeAPITest(APITestCase):
         Discussion.objects.create(subject=org_dataset, title='', user=user),
 
         # Should really not be listed.
-        Discussion.objects.create(subject=DatasetFactory(), title='foô', user=user)
+        Discussion.objects.create(subject=VisibleDatasetFactory(), title='foô', user=user)
         Discussion.objects.create(subject=ReuseFactory(), title='foô', user=user)
 
         response = self.get(url_for('api.my_org_discussions'), qs={'q': 'foô'})

udata/tests/dataset/test_dataset_actions.py

@@ -1,7 +1,7 @@
 import pytest
 
 from udata.core.dataset.actions import archive
-from udata.core.dataset.factories import DatasetFactory
+from udata.core.dataset.factories import VisibleDatasetFactory
 from udata.core.discussions.models import Discussion
 from udata.core.user.factories import UserFactory
 
@@ -13,7 +13,7 @@ class DatasetActionsTest:
         user = UserFactory()
         app.config['ARCHIVE_COMMENT_USER_ID'] = user.id
 
-        dataset = DatasetFactory()
+        dataset = VisibleDatasetFactory()
 
         archive(dataset, comment=True)
 

udata/tests/dataset/test_dataset_commands.py

@@ -2,14 +2,14 @@ import pytest
 
 from tempfile import NamedTemporaryFile
 
-from udata.core.dataset.factories import DatasetFactory
+from udata.core.dataset.factories import VisibleDatasetFactory
 
 
 @pytest.mark.usefixtures('clean_db')
 class DatasetCommandTest:
 
     def test_dataset_archive_one(self, cli):
-        dataset = DatasetFactory()
+        dataset = VisibleDatasetFactory()
 
         cli('dataset', 'archive-one', str(dataset.id))
 
@@ -17,7 +17,7 @@ class DatasetCommandTest:
         assert dataset.archived is not None
 
     def test_dataset_archive(self, cli):
-        datasets = [DatasetFactory() for _ in range(2)]
+        datasets = [VisibleDatasetFactory() for _ in range(2)]
 
         with NamedTemporaryFile(mode='w', encoding='utf8') as temp:
             temp.write('\n'.join((str(d.id) for d in datasets)))

udata/tests/dataset/test_dataset_model.py

@@ -524,8 +524,7 @@ class LicenseModelTest:
 
 class ResourceSchemaTest:
     @pytest.mark.options(SCHEMA_CATALOG_URL='https://example.com/notfound')
-    def test_resource_schema_objects_404_endpoint(self, rmock):
-        rmock.get('https://example.com/notfound', status_code=404)
+    def test_resource_schema_objects_404_endpoint(self):
         with pytest.raises(SchemasCatalogNotFoundException):
             ResourceSchema.objects()
 

udata/tests/organization/test_organization_model.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from udata.core.dataset.factories import DatasetFactory, HiddenDatasetFactory
+from udata.core.dataset.factories import DatasetFactory, VisibleDatasetFactory
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.followers.signals import on_follow, on_unfollow
 from udata.core.reuse.factories import ReuseFactory, VisibleReuseFactory
@@ -27,8 +27,8 @@ class OrganizationModelTest(TestCase, DBTestMixin):
             reuse = VisibleReuseFactory(organization=org)
             ReuseFactory(organization=org)
         with assert_emit(Dataset.on_create):
-            dataset = DatasetFactory(organization=org)
-            HiddenDatasetFactory(organization=org)
+            dataset = VisibleDatasetFactory(organization=org)
+            DatasetFactory(organization=org)
         with assert_emit(on_follow):
             follow = Follow.objects.create(following=org, follower=UserFactory(),
                                            since=datetime.utcnow())

udata/tests/organization/test_organization_rdf.py

@@ -9,7 +9,7 @@ from udata.rdf import DCAT, DCT, HYDRA
 from udata.tests import TestCase, DBTestMixin
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.organization.rdf import organization_to_rdf, build_org_catalog
-from udata.core.dataset.factories import DatasetFactory
+from udata.core.dataset.factories import VisibleDatasetFactory
 from udata.core.dataset.models import Dataset
 from udata.utils import faker
 
@@ -57,7 +57,7 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         origin_org = OrganizationFactory()
         uri = url_for('api.organization_rdf', org=origin_org.id, _external=True)
 
-        datasets = DatasetFactory.create_batch(3, organization=origin_org)
+        datasets = VisibleDatasetFactory.create_batch(3, organization=origin_org)
         catalog = build_org_catalog(origin_org, datasets)
 
         graph = catalog.graph
@@ -93,7 +93,7 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
                             page=1, page_size=page_size, _external=True)
         uri_last = url_for('api.organization_rdf_format', org=origin_org.id, format='json',
                            page=2, page_size=page_size, _external=True)
-        DatasetFactory.create_batch(total, organization=origin_org)
+        VisibleDatasetFactory.create_batch(total, organization=origin_org)
 
         # First page
         datasets = Dataset.objects.paginate(1, page_size)

udata/tests/reuse/test_reuse_model.py

@@ -5,7 +5,7 @@ from udata.models import Reuse
 from udata.core.dataset import tasks as dataset_tasks
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.reuse.factories import ReuseFactory, VisibleReuseFactory
-from udata.core.dataset.factories import DatasetFactory
+from udata.core.dataset.factories import VisibleDatasetFactory
 from udata.core.user.factories import UserFactory
 from udata.core.discussions.factories import DiscussionFactory
 from udata.i18n import gettext as _
@@ -65,7 +65,7 @@ class ReuseModelTest(TestCase, DBTestMixin):
             reuse.save()
 
     def test_reuse_metrics(self):
-        dataset = DatasetFactory()
+        dataset = VisibleDatasetFactory()
         reuse = VisibleReuseFactory()
         DiscussionFactory(subject=reuse)