udata 12.0.2.dev17__py3-none-any.whl → 12.0.2.dev19__py3-none-any.whl

udata/commands/tests/test_fixtures.py

@@ -19,11 +19,10 @@ from udata.core.organization.models import Member
 from udata.core.reuse.factories import ReuseFactory
 from udata.core.spam.models import SpamMixin
 from udata.core.user.factories import UserFactory
+from udata.tests.api import PytestOnlyAPITestCase
 
 
-@pytest.mark.usefixtures("clean_db")
-class FixturesTest:
-    @pytest.mark.frontend
+class FixturesTest(PytestOnlyAPITestCase):
     @pytest.mark.options(FIXTURE_DATASET_SLUGS=["some-test-dataset-slug"])
     def test_generate_fixtures_file_then_import(self, app, cli, api, monkeypatch):
         """Test generating fixtures from the current env, then importing them back."""

udata/core/badges/tests/test_commands.py

@@ -1,13 +1,11 @@
 from tempfile import NamedTemporaryFile
 
-import pytest
-
 from udata.core.organization.constants import CERTIFIED, PUBLIC_SERVICE
 from udata.core.organization.factories import OrganizationFactory
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.usefixtures("clean_db")
-class BadgeCommandTest:
+class BadgeCommandTest(PytestOnlyDBTestCase):
     def toggle(self, path_or_id, kind):
         return self.cli("badges", "toggle", path_or_id, kind)
 

udata/core/badges/tests/test_model.py

@@ -2,7 +2,7 @@ from udata.api_fields import field
 from udata.auth import login_user
 from udata.core.user.factories import UserFactory
 from udata.mongo import db
-from udata.tests import DBTestMixin, TestCase
+from udata.tests.api import DBTestCase
 
 from ..models import Badge, BadgeMixin, BadgesList
 
@@ -33,7 +33,7 @@ class Fake(db.Document, FakeBadgeMixin):
     pass
 
 
-class BadgeMixinTest(DBTestMixin, TestCase):
+class BadgeMixinTest(DBTestCase):
     def test_attributes(self):
         """It should have a badge list"""
         fake = Fake.objects.create()

udata/core/dataservices/models.py

@@ -323,6 +323,10 @@ class Dataservice(Auditable, WithMetrics, Linkable, Owned, db.Document):
         "views",
     ]
 
+    @property
+    def is_visible(self):
+        return not self.is_hidden
+
     @property
     def is_hidden(self):
         return self.private or self.deleted_at or self.archived_at

udata/core/dataservices/search.py

@@ -79,7 +79,7 @@ class DataserviceSearch(ModelSearchAdapter):
 
     @classmethod
     def is_indexable(cls, dataservice: Dataservice) -> bool:
-        return dataservice.deleted_at is None and not dataservice.private
+        return dataservice.is_visible
 
     @classmethod
     def mongo_search(cls, args):

udata/core/dataset/search.py

@@ -54,8 +54,8 @@ class DatasetSearch(ModelSearchAdapter):
     }
 
     @classmethod
-    def is_indexable(cls, dataset):
-        return dataset.deleted is None and dataset.archived is None and not dataset.private
+    def is_indexable(cls, dataset: Dataset):
+        return dataset.is_visible
 
     @classmethod
     def mongo_search(cls, args):

udata/core/organization/search.py

@@ -29,7 +29,7 @@ class OrganizationSearch(search.ModelSearchAdapter):
     }
 
     @classmethod
-    def is_indexable(cls, org):
+    def is_indexable(cls, org: Organization):
         return org.deleted is None
 
     @classmethod

udata/core/pages/tests/test_api.py

@@ -6,8 +6,6 @@ from udata.tests.api import APITestCase
 
 
 class PageAPITest(APITestCase):
-    modules = []
-
     def test_create_get_update(self):
         self.login()
         datasets = DatasetFactory.create_batch(3)

udata/core/reuse/search.py

@@ -40,7 +40,7 @@ class ReuseSearch(ModelSearchAdapter):
 
     @classmethod
     def is_indexable(cls, reuse: Reuse) -> bool:
-        return reuse.deleted is None and len(reuse.datasets) > 0 and not reuse.private
+        return reuse.is_visible
 
     @classmethod
     def mongo_search(cls, args):

udata/core/spatial/tests/test_api.py

@@ -1,3 +1,4 @@
+import pytest
 from flask import url_for
 
 from udata.core.dataset.factories import DatasetFactory
@@ -13,15 +14,12 @@ from udata.core.spatial.tasks import compute_geozones_metrics
 from udata.tests.api import APITestCase
 from udata.tests.api.test_datasets_api import SAMPLE_GEOM
 from udata.tests.features.territories import (
-    TerritoriesSettings,
     create_geozones_fixtures,
 )
 from udata.utils import faker
 
 
 class SpatialApiTest(APITestCase):
-    modules = []
-
     def test_zones_api_one(self):
         zone = GeoZoneFactory()
 
@@ -65,7 +63,7 @@ class SpatialApiTest(APITestCase):
         for i in range(4):
             GeoZoneFactory(name="name-test-{0}".format(i) if i % 2 else faker.word())
 
-        response = self.get(url_for("api.suggest_zones"), qs={"q": "name-test", "size": "5"})
+        response = self.get(url_for("api.suggest_zones", q="name-test", size=5))
         self.assert200(response)
 
         self.assertEqual(len(response.json), 2)
@@ -84,7 +82,7 @@ class SpatialApiTest(APITestCase):
         for _ in range(2):
             GeoZoneFactory()
 
-        response = self.get(url_for("api.suggest_zones"), qs={"q": zone.id})
+        response = self.get(url_for("api.suggest_zones", q=zone.id))
         self.assert200(response)
 
         self.assertEqual(response.json[0]["id"], zone["id"])
@@ -96,7 +94,7 @@ class SpatialApiTest(APITestCase):
         country_zone = GeoZoneFactory(name="name-test-country", level=country_level.id)
         region_zone = GeoZoneFactory(name="name-test-region", level=region_level.id)
 
-        response = self.get(url_for("api.suggest_zones"), qs={"q": "name-test", "size": "5"})
+        response = self.get(url_for("api.suggest_zones", q="name-test", size=5))
         self.assert200(response)
 
         self.assertEqual(len(response.json), 2)
@@ -108,7 +106,7 @@ class SpatialApiTest(APITestCase):
         for i in range(4):
             GeoZoneFactory(code="code-test-{0}".format(i) if i % 2 else faker.word())
 
-        response = self.get(url_for("api.suggest_zones"), qs={"q": "code-test", "size": "5"})
+        response = self.get(url_for("api.suggest_zones", q="code-test", size=5))
         self.assert200(response)
 
         self.assertEqual(len(response.json), 2)
@@ -126,7 +124,7 @@ class SpatialApiTest(APITestCase):
         for i in range(3):
             GeoZoneFactory(name=5 * "{0}".format(i), code=3 * "{0}".format(i))
 
-        response = self.get(url_for("api.suggest_zones"), qs={"q": "xxxxxx", "size": "5"})
+        response = self.get(url_for("api.suggest_zones", q="xxxxxx", size=5))
         self.assert200(response)
         self.assertEqual(len(response.json), 0)
 
@@ -135,7 +133,7 @@ class SpatialApiTest(APITestCase):
         for i in range(4):
             GeoZoneFactory(name="name-testé-{0}".format(i) if i % 2 else faker.word())
 
-        response = self.get(url_for("api.suggest_zones"), qs={"q": "name-testé", "size": "5"})
+        response = self.get(url_for("api.suggest_zones", q="name-testé", size=5))
         self.assert200(response)
 
         self.assertEqual(len(response.json), 2)
@@ -150,7 +148,7 @@ class SpatialApiTest(APITestCase):
 
     def test_suggest_zones_empty(self):
         """It should not provide zones suggestion if no data is present"""
-        response = self.get(url_for("api.suggest_zones"), qs={"q": "xxxxxx", "size": "5"})
+        response = self.get(url_for("api.suggest_zones", q="xxxxxx", size=5))
         self.assert200(response)
         self.assertEqual(len(response.json), 0)
 
@@ -194,7 +192,7 @@ class SpatialApiTest(APITestCase):
                 organization=organization, spatial=SpatialCoverageFactory(zones=[paca.id])
             )
 
-        response = self.get(url_for("api.zone_datasets", id=paca.id), qs={"size": 2})
+        response = self.get(url_for("api.zone_datasets", id=paca.id, size=2))
         self.assert200(response)
         self.assertEqual(len(response.json), 2)
 
@@ -206,7 +204,7 @@ class SpatialApiTest(APITestCase):
                 organization=organization, spatial=SpatialCoverageFactory(zones=[paca.id])
             )
 
-        response = self.get(url_for("api.zone_datasets", id=paca.id), qs={"dynamic": 1})
+        response = self.get(url_for("api.zone_datasets", id=paca.id, dynamic=1))
         self.assert200(response)
         # No dynamic datasets given that the setting is deactivated by default.
         self.assertEqual(len(response.json), 3)
@@ -219,7 +217,7 @@ class SpatialApiTest(APITestCase):
                 organization=organization, spatial=SpatialCoverageFactory(zones=[paca.id])
             )
 
-        response = self.get(url_for("api.zone_datasets", id=paca.id), qs={"dynamic": 1, "size": 2})
+        response = self.get(url_for("api.zone_datasets", id=paca.id, dynamic=1, size=2))
         self.assert200(response)
         # No dynamic datasets given that the setting is deactivated by default.
         self.assertEqual(len(response.json), 2)
@@ -260,10 +258,11 @@ class SpatialApiTest(APITestCase):
         self.assertEqual(response.json["features"][1]["properties"]["datasets"], 3)
 
 
+@pytest.mark.options(
+    ACTIVATE_TERRITORIES=True,
+    HANDLED_LEVELS=("fr:commune", "fr:departement", "fr:region", "country"),
+)
 class SpatialTerritoriesApiTest(APITestCase):
-    modules = []
-    settings = TerritoriesSettings
-
     def test_zone_datasets_with_dynamic_and_setting(self):
         paca, bdr, arles = create_geozones_fixtures()
         organization = OrganizationFactory()
@@ -272,7 +271,7 @@ class SpatialTerritoriesApiTest(APITestCase):
                 organization=organization, spatial=SpatialCoverageFactory(zones=[paca.id])
             )
 
-        response = self.get(url_for("api.zone_datasets", id=paca.id), qs={"dynamic": 1})
+        response = self.get(url_for("api.zone_datasets", id=paca.id, dynamic=1))
         self.assert200(response)
         # No dynamic datasets given that they are added by udata-front extension.
         self.assertEqual(len(response.json), 3)
@@ -285,15 +284,13 @@ class SpatialTerritoriesApiTest(APITestCase):
                 organization=organization, spatial=SpatialCoverageFactory(zones=[paca.id])
             )
 
-        response = self.get(url_for("api.zone_datasets", id=paca.id), qs={"dynamic": 1, "size": 2})
+        response = self.get(url_for("api.zone_datasets", id=paca.id, dynamic=1, size=2))
         self.assert200(response)
         # No dynamic datasets given that they are added by udata-front extension.
         self.assertEqual(len(response.json), 2)
 
 
 class DatasetsSpatialAPITest(APITestCase):
-    modules = []
-
     def test_create_spatial_zones(self):
         paca, _, _ = create_geozones_fixtures()
         granularity = spatial_granularities[0][0]

udata/core/spatial/tests/test_models.py

@@ -1,6 +1,6 @@
 from datetime import timedelta
 
-from udata.tests import DBTestMixin, TestCase
+from udata.tests.api import DBTestCase
 
 from ..factories import GeoZoneFactory
 from ..models import GeoZone, SpatialCoverage
@@ -8,7 +8,7 @@ from ..models import GeoZone, SpatialCoverage
 A_YEAR = timedelta(days=365)
 
 
-class SpacialCoverageTest(DBTestMixin, TestCase):
+class SpacialCoverageTest(DBTestCase):
     def test_top_label_empty(self):
         coverage = SpatialCoverage()
         self.assertIsNone(coverage.top_label)
@@ -19,7 +19,7 @@ class SpacialCoverageTest(DBTestMixin, TestCase):
         self.assertEqual(coverage.top_label, "name")
 
 
-class SpatialTemporalResolutionTest(DBTestMixin, TestCase):
+class SpatialTemporalResolutionTest(DBTestCase):
     def test_resolve_id_only(self):
         zone = GeoZoneFactory()
         for i in range(3):

udata/core/user/tests/test_user_model.py

@@ -6,14 +6,10 @@ from udata.core.followers.models import Follow
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.user.factories import UserFactory
 from udata.core.user.models import User
+from udata.tests.api import APITestCase
 
-pytestmark = pytest.mark.usefixtures("clean_db")
-
-
-@pytest.mark.frontend
-class UserModelTest:
-    modules = []  # Required for mails
 
+class UserModelTest(APITestCase):
     def test_mark_as_deleted(self):
         user = UserFactory()
         other_user = UserFactory()

udata/features/identicon/tests/test_backends.py

@@ -1,20 +1,10 @@
-import pytest
-
 from udata.features.identicon.backends import internal
+from udata.tests.api import PytestOnlyAPITestCase
 from udata.tests.helpers import assert200
 from udata.utils import faker
 
-pytestmark = pytest.mark.usefixtures("app")
-
-
-def assert_stream_equal(response1, response2):
-    __tracebackhide__ = True
-    stream1 = list(response1.iter_encoded())
-    stream2 = list(response2.iter_encoded())
-    assert stream1 == stream2
-
 
-class InternalBackendTest:
+class InternalBackendTest(PytestOnlyAPITestCase):
     def test_base_rendering(self):
         response = internal(faker.word(), 32)
         assert200(response)
@@ -25,4 +15,4 @@ class InternalBackendTest:
 
     def test_render_twice_the_same(self):
         identifier = faker.word()
-        assert_stream_equal(internal(identifier, 32), internal(identifier, 32))
+        self.assertStreamEqual(internal(identifier, 32), internal(identifier, 32))