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

udata/tests/api/test_reuses_api.py

@@ -13,7 +13,7 @@ from udata.core.reuse.constants import REUSE_TOPICS, REUSE_TYPES
 from udata.core.reuse.factories import ReuseFactory
 from udata.core.user.factories import AdminFactory, UserFactory
 from udata.models import Follow, Member, Reuse
-from udata.tests.api import APITestCase
+from udata.tests.api import APITestCase, PytestOnlyAPITestCase
 from udata.tests.helpers import (
     assert200,
     assert201,
@@ -24,19 +24,13 @@ from udata.tests.helpers import (
 )
 from udata.utils import faker
 
-pytestmark = [
-    pytest.mark.usefixtures("clean_db"),
-]
-
 
 def reuse_in_response(response: TestResponse, reuse: Reuse) -> bool:
     only_reuse = [r for r in response.json["data"] if r["id"] == str(reuse.id)]
     return len(only_reuse) > 0
 
 
-class ReuseAPITest:
-    modules = []
-
+class ReuseAPITest(PytestOnlyAPITestCase):
     def test_reuse_api_list(self, api):
         """It should fetch a reuse list from the API"""
         reuses = ReuseFactory.create_batch(3, visible=True)
@@ -523,7 +517,7 @@ class ReuseAPITest:
             title="arealtestprefix-4", visible=True, metrics={"followers": 10}
         )
 
-        response = api.get(url_for("api.suggest_reuses"), qs={"q": "arealtestpref", "size": "5"})
+        response = api.get(url_for("api.suggest_reuses", q="arealtestpref", size=5))
         assert200(response)
 
         assert len(response.json) <= 5
@@ -542,7 +536,7 @@ class ReuseAPITest:
         for i in range(4):
             ReuseFactory(title="testé-{0}".format(i) if i % 2 else faker.word(), visible=True)
 
-        response = api.get(url_for("api.suggest_reuses"), qs={"q": "testé", "size": "5"})
+        response = api.get(url_for("api.suggest_reuses", q="testé", size=5))
         assert200(response)
 
         assert len(response.json) <= 5
@@ -559,14 +553,14 @@ class ReuseAPITest:
         """It should not provide reuse suggestion if no match"""
         ReuseFactory.create_batch(3, visible=True)
 
-        response = api.get(url_for("api.suggest_reuses"), qs={"q": "xxxxxx", "size": "5"})
+        response = api.get(url_for("api.suggest_reuses", q="xxxxxx", size=5))
         assert200(response)
         assert len(response.json) == 0
 
     def test_suggest_reuses_api_empty(self, api):
         """It should not provide reuse suggestion if no data"""
         # self.init_search()
-        response = api.get(url_for("api.suggest_reuses"), qs={"q": "xxxxxx", "size": "5"})
+        response = api.get(url_for("api.suggest_reuses", q="xxxxxx", size=5))
         assert200(response)
         assert len(response.json) == 0
 
@@ -630,11 +624,9 @@ class ReusesFeedAPItest(APITestCase):
         self.assertEqual(author.href, org.url_for())
 
 
-class ReuseBadgeAPITest:
-    modules = []
-
+class ReuseBadgeAPITest(PytestOnlyAPITestCase):
     @pytest.fixture(autouse=True)
-    def setup(self, api, clean_db):
+    def setup_func(self, api):
         # Register at least two badges
         Reuse.__badges__["test-1"] = "Test 1"
         Reuse.__badges__["test-2"] = "Test 2"
@@ -695,9 +687,7 @@ class ReuseBadgeAPITest:
         assert404(response)
 
 
-class ReuseReferencesAPITest:
-    modules = []
-
+class ReuseReferencesAPITest(PytestOnlyAPITestCase):
     def test_reuse_types_list(self, api):
         """It should fetch the reuse types list from the API"""
         response = api.get(url_for("api.reuse_types"))

udata/tests/api/test_swagger.py

@@ -3,12 +3,11 @@ import json
 from flask import url_for
 from flask_restx import schemas
 
+from udata.tests.api import PytestOnlyAPITestCase
 from udata.tests.helpers import assert200
 
 
-class SwaggerBlueprintTest:
-    modules = []
-
+class SwaggerBlueprintTest(PytestOnlyAPITestCase):
     def test_swagger_resource_type(self, api):
         response = api.get(url_for("api.specs"))
         assert200(response)

udata/tests/api/test_tags_api.py

@@ -1,15 +1,14 @@
-import pytest
 from flask import url_for
 
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.reuse.factories import ReuseFactory
 from udata.core.tags.tasks import count_tags
+from udata.tests.api import PytestOnlyAPITestCase
 from udata.tests.helpers import assert200
 from udata.utils import faker
 
 
-@pytest.mark.frontend
-class TagsAPITest:
+class TagsAPITest(PytestOnlyAPITestCase):
     def test_suggest_tags_api(self, api):
         """It should suggest tags"""
         for i in range(3):
@@ -19,7 +18,7 @@ class TagsAPITest:
 
         count_tags()
 
-        response = api.get(url_for("api.suggest_tags"), qs={"q": "tes", "size": "5"})
+        response = api.get(url_for("api.suggest_tags", q="tes", size=5))
         assert200(response)
 
         assert len(response.json) <= 5
@@ -39,7 +38,7 @@ class TagsAPITest:
 
         count_tags()
 
-        response = api.get(url_for("api.suggest_tags"), qs={"q": "testé", "size": "5"})
+        response = api.get(url_for("api.suggest_tags", q="testé", size=5))
         assert200(response)
 
         assert len(response.json) <= 5
@@ -59,12 +58,12 @@ class TagsAPITest:
 
         count_tags()
 
-        response = api.get(url_for("api.suggest_tags"), qs={"q": "bbbb", "size": "5"})
+        response = api.get(url_for("api.suggest_tags", q="bbbb", size=5))
         assert200(response)
         assert len(response.json) == 0
 
     def test_suggest_tags_api_empty(self, api):
         """It should not provide tag suggestion if no data"""
-        response = api.get(url_for("api.suggest_tags"), qs={"q": "bbbb", "size": "5"})
+        response = api.get(url_for("api.suggest_tags", q="bbbb", size=5))
         assert200(response)
         assert len(response.json) == 0

udata/tests/api/test_transfer_api.py

@@ -12,8 +12,6 @@ from . import APITestCase
 
 
 class TransferAPITest(APITestCase):
-    modules = []
-
     def test_request_dataset_transfer(self):
         user = self.login()
         recipient_user = UserFactory()

udata/tests/api/test_user_api.py

@@ -11,8 +11,6 @@ from . import APITestCase
 
 
 class UserAPITest(APITestCase):
-    modules = []
-
     def test_follow_user(self):
         """It should follow an user on POST"""
         user = self.login()
@@ -65,7 +63,7 @@ class UserAPITest(APITestCase):
         for i in range(4):
             UserFactory(first_name="first-name-test-{0}".format(i) if i % 2 else faker.word())
 
-        response = self.get(url_for("api.suggest_users"), qs={"q": "first-name-test", "size": "5"})
+        response = self.get(url_for("api.suggest_users", q="first-name-test", size=5))
         self.assert200(response)
 
         self.assertLessEqual(len(response.json), 5)
@@ -84,7 +82,7 @@ class UserAPITest(APITestCase):
         for i in range(4):
             UserFactory(last_name="last-name-test-{0}".format(i) if i % 2 else faker.word())
 
-        response = self.get(url_for("api.suggest_users"), qs={"q": "last-name-test", "size": "5"})
+        response = self.get(url_for("api.suggest_users", q="last-name-test", size=5))
         self.assert200(response)
 
         self.assertLessEqual(len(response.json), 5)
@@ -102,7 +100,7 @@ class UserAPITest(APITestCase):
         for i in range(4):
             UserFactory(last_name="last-name-testé-{0}".format(i) if i % 2 else faker.word())
 
-        response = self.get(url_for("api.suggest_users"), qs={"q": "last-name-testé", "size": "5"})
+        response = self.get(url_for("api.suggest_users", q="last-name-testé", size=5))
         self.assert200(response)
 
         self.assertLessEqual(len(response.json), 5)
@@ -119,13 +117,13 @@ class UserAPITest(APITestCase):
         """It should not provide user suggestion if no match"""
         UserFactory.create_batch(3)
 
-        response = self.get(url_for("api.suggest_users"), qs={"q": "xxxxxx", "size": "5"})
+        response = self.get(url_for("api.suggest_users", q="xxxxxx", size=5))
         self.assert200(response)
         self.assertEqual(len(response.json), 0)
 
     def test_suggest_users_api_empty(self):
         """It should not provide user suggestion if no data"""
-        response = self.get(url_for("api.suggest_users"), qs={"q": "xxxxxx", "size": "5"})
+        response = self.get(url_for("api.suggest_users", q="xxxxxx", size=5))
         self.assert200(response)
         self.assertEqual(len(response.json), 0)
 
@@ -133,7 +131,7 @@ class UserAPITest(APITestCase):
         """It should suggest users without deduplicating homonyms"""
         UserFactory.create_batch(2, first_name="test", last_name="homonym")
 
-        response = self.get(url_for("api.suggest_users"), qs={"q": "homonym", "size": "5"})
+        response = self.get(url_for("api.suggest_users", q="homonym", size=5))
         self.assert200(response)
 
         self.assertEqual(len(response.json), 2)
@@ -144,11 +142,11 @@ class UserAPITest(APITestCase):
 
     def test_suggest_users_api_size_validation(self):
         """It should validate that the size parameter is between 1 and 20."""
-        response = self.get(url_for("api.suggest_users"), qs={"q": "foobar", "size": "0"})
+        response = self.get(url_for("api.suggest_users", q="foobar", size=0))
         self.assert400(response)
         self.assertIn("between 1 and 20", response.json["errors"]["size"])
 
-        response = self.get(url_for("api.suggest_users"), qs={"q": "foobar", "size": "21"})
+        response = self.get(url_for("api.suggest_users", q="foobar", size=21))
 
         self.assert400(response)
         self.assertIn("between 1 and 20", response.json["errors"]["size"])

udata/tests/apiv2/test_datasets.py

@@ -367,8 +367,6 @@ class DatasetResourceAPIV2Test(APITestCase):
 
 
 class DatasetExtrasAPITest(APITestCase):
-    modules = None
-
     def setUp(self):
         self.login()
         self.dataset = DatasetFactory(owner=self.user)
@@ -503,8 +501,6 @@ class DatasetExtrasAPITest(APITestCase):
 
 
 class DatasetResourceExtrasAPITest(APITestCase):
-    modules = None
-
     def setUp(self):
         self.login()
         self.dataset = DatasetFactory(owner=self.user)

udata/tests/apiv2/test_me_api.py

@@ -7,8 +7,6 @@ from udata.tests.api import APITestCase
 
 
 class MeAPIv2Test(APITestCase):
-    modules = []
-
     def test_my_org_topics(self):
         user = self.login()
         member = Member(user=user, role="editor")

udata/tests/apiv2/test_organizations.py

@@ -5,8 +5,6 @@ from udata.tests.api import APITestCase
 
 
 class OrganizationExtrasAPITest(APITestCase):
-    modules = None
-
     def setUp(self):
         self.login()
         member = Member(user=self.user, role="admin")

udata/tests/apiv2/test_swagger.py

@@ -3,12 +3,11 @@ import json
 from flask import url_for
 from flask_restx import schemas
 
+from udata.tests.api import PytestOnlyAPITestCase
 from udata.tests.helpers import assert200
 
 
-class SwaggerBlueprintTest:
-    modules = []
-
+class SwaggerBlueprintTest(PytestOnlyAPITestCase):
     def test_swagger_resource_type(self, api):
         response = api.get(url_for("apiv2.specs"))
         assert200(response)

udata/tests/apiv2/test_topics.py

@@ -27,8 +27,6 @@ from udata.tests.features.territories import create_geozones_fixtures
 
 
 class TopicsListAPITest(APITestCase):
-    modules = []
-
     def test_topic_api_list(self):
         """It should fetch a topic list from the API"""
         owner = UserFactory()

udata/tests/cli/test_cli_base.py

@@ -1,16 +1,18 @@
-def test_cli_help(cli):
-    """Should display help without errors"""
-    cli()
-    cli("-?")
-    cli("-h")
-    cli("--help")
+from udata.tests import PytestOnlyTestCase
 
 
-def test_cli_log_and_printing(cli):
-    """Should properly log and print"""
-    cli("test log")
+class CliBaseTest(PytestOnlyTestCase):
+    def test_cli_help(self, cli):
+        """Should display help without errors"""
+        cli()
+        cli("-?")
+        cli("-h")
+        cli("--help")
 
+    def test_cli_log_and_printing(self, cli):
+        """Should properly log and print"""
+        cli("test log")
 
-def test_cli_version(cli):
-    """Should display version without errors"""
-    cli("--version")
+    def test_cli_version(self, cli):
+        """Should display version without errors"""
+        cli("--version")

udata/tests/cli/test_db_cli.py

@@ -2,13 +2,15 @@ from datetime import datetime
 
 import pytest
 from bson import ObjectId
+from mongoengine.connection import get_db
 
 from udata.models import Reuse
+from udata.tests.api import PytestOnlyDBTestCase
 
 
 @pytest.fixture
-def migrations(db):
-    db.migrations.insert_one(
+def migrations():
+    get_db().migrations.insert_one(
         {
             "plugin": "udata",
             "filename": "test.py",
@@ -17,55 +19,50 @@ def migrations(db):
             "output": "ok",
         }
     )
-    return db.migrations
-
-
-def test_unrecord_with_complete_filename(cli, migrations):
-    """Should display help without errors"""
-    result = cli("db unrecord udata test.py")
-    assert result.exit_code == 0
-    assert migrations.count_documents({}) == 0
-
-
-def test_unrecord_with_filename_without_extension(cli, migrations):
-    """Should display help without errors"""
-    result = cli("db unrecord udata test")
-    assert result.exit_code == 0
-    assert migrations.count_documents({}) == 0
-
-
-def test_unrecord_with_single_parameter(cli, migrations):
-    """Should display help without errors"""
-    result = cli("db unrecord udata:test.py")
-    assert result.exit_code == 0
-    assert migrations.count_documents({}) == 0
-
-
-def test_unrecord_with_single_parameter_without_extension(cli, migrations):
-    """Should display help without errors"""
-    result = cli("db unrecord udata:test")
-    assert result.exit_code == 0
-    assert migrations.count_documents({}) == 0
-
-
-def test_unrecord_without_parameters(cli, migrations):
-    """Should display help without errors"""
-    result = cli("db unrecord", check=False)
-    assert result.exit_code != 0
-    assert migrations.count_documents({}) == 1
-
-
-def test_unrecord_with_too_many_parameters(cli, migrations):
-    """Should display help without errors"""
-    result = cli("db unrecord udata test.py too many", check=False)
-    assert result.exit_code != 0
-    assert migrations.count_documents({}) == 1
-
-
-def test_check_references_report_listfield_missing(cli, clean_db):
-    # The cli command `udata db check-integrity` should catch reuse object missing datasets field
-    Reuse._get_collection().insert_one({"_id": ObjectId()})
-
-    result = cli("db check-integrity --models Reuse", check=False)
-    assert "Reuse.datasets(Dataset) — list…: 1" in result.output
-    assert result.exit_code != 0
+    return get_db().migrations
+
+
+class DBCliTest(PytestOnlyDBTestCase):
+    def test_unrecord_with_complete_filename(self, cli, migrations):
+        """Should display help without errors"""
+        result = cli("db unrecord udata test.py")
+        assert result.exit_code == 0
+        assert migrations.count_documents({}) == 0
+
+    def test_unrecord_with_filename_without_extension(self, cli, migrations):
+        """Should display help without errors"""
+        result = cli("db unrecord udata test")
+        assert result.exit_code == 0
+        assert migrations.count_documents({}) == 0
+
+    def test_unrecord_with_single_parameter(self, cli, migrations):
+        """Should display help without errors"""
+        result = cli("db unrecord udata:test.py")
+        assert result.exit_code == 0
+        assert migrations.count_documents({}) == 0
+
+    def test_unrecord_with_single_parameter_without_extension(self, cli, migrations):
+        """Should display help without errors"""
+        result = cli("db unrecord udata:test")
+        assert result.exit_code == 0
+        assert migrations.count_documents({}) == 0
+
+    def test_unrecord_without_parameters(self, cli, migrations):
+        """Should display help without errors"""
+        result = cli("db unrecord", check=False)
+        assert result.exit_code != 0
+        assert migrations.count_documents({}) == 1
+
+    def test_unrecord_with_too_many_parameters(self, cli, migrations):
+        """Should display help without errors"""
+        result = cli("db unrecord udata test.py too many", check=False)
+        assert result.exit_code != 0
+        assert migrations.count_documents({}) == 1
+
+    def test_check_references_report_listfield_missing(self, cli):
+        # The cli command `udata db check-integrity` should catch reuse object missing datasets field
+        Reuse._get_collection().insert_one({"_id": ObjectId()})
+
+        result = cli("db check-integrity --models Reuse", check=False)
+        assert "Reuse.datasets(Dataset) — list…: 1" in result.output
+        assert result.exit_code != 0

udata/tests/contact_point/test_contact_point_models.py

@@ -2,10 +2,10 @@ import pytest
 
 from udata.core.contact_point.factories import ContactPointFactory
 from udata.models import db
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.usefixtures("clean_db")
-class ContactPointTest:
+class ContactPointTest(PytestOnlyDBTestCase):
     def test_validate_contact_role_needs_email_or_contact_form(self):
         with pytest.raises(db.ValidationError):
             ContactPointFactory(role="contact", email=None, contact_form=None)

udata/tests/dataservice/test_csv_adapter.py

@@ -1,17 +1,14 @@
 from datetime import datetime
 
-import pytest
-
 from udata.core.dataservices.csv import DataserviceCsvAdapter
 from udata.core.dataservices.factories import DataserviceFactory
 from udata.core.dataservices.models import Dataservice
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.organization.factories import OrganizationFactory
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.frontend
-@pytest.mark.usefixtures("clean_db")
-class DataserviceCSVAdapterTest:
+class DataserviceCSVAdapterTest(PytestOnlyDBTestCase):
     def test_dataservices_csv_adapter(self):
         dataservice = DataserviceFactory(
             created_at=datetime(2022, 12, 31),

udata/tests/dataservice/test_dataservice_rdf.py

@@ -16,13 +16,11 @@ from udata.rdf import (
     HVD_LEGISLATION,
     TAG_TO_EU_HVD_CATEGORIES,
 )
+from udata.tests.api import PytestOnlyAPITestCase
 from udata.tests.helpers import assert200, assert_redirects
 
-pytestmark = pytest.mark.usefixtures("app")
 
-
-@pytest.mark.frontend
-class DataserviceToRdfTest:
+class DataserviceToRdfTest(PytestOnlyAPITestCase):
     def test_minimal(self):
         dataservice = DataserviceFactory.build()  # Does not have an URL
         d = dataservice_to_rdf(dataservice)
@@ -83,8 +81,7 @@ class DataserviceToRdfTest:
             assert distrib.value(DCATAP.applicableLegislation).identifier == URIRef(HVD_LEGISLATION)
 
 
-@pytest.mark.frontend
-class DataserviceRdfViewsTest:
+class DataserviceRdfViewsTest(PytestOnlyAPITestCase):
     def test_rdf_default_to_jsonld(self, client):
         dataservice = DataserviceFactory()
         expected = url_for("api.dataservice_rdf_format", dataservice=dataservice.id, _format="json")

udata/tests/dataservice/test_dataservice_tasks.py

@@ -1,47 +1,45 @@
-import pytest
-
 from udata.core.dataservices import tasks
 from udata.core.dataservices.models import Dataservice
 from udata.core.user.factories import UserFactory
 from udata.harvest.models import HarvestItem, HarvestJob
 from udata.harvest.tests.factories import HarvestJobFactory
 from udata.models import Discussion, Follow, Message, Transfer
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.utils import faker
 
-pytestmark = pytest.mark.usefixtures("clean_db")
-
-
-def test_purge_dataservices():
-    dataservices = [
-        Dataservice.objects.create(
-            title="delete me", base_api_url="https://example.com/api", deleted_at="2016-01-01"
-        ),
-        Dataservice.objects.create(title="keep me", base_api_url="https://example.com/api"),
-    ]
-
-    user = UserFactory()
-    transfer = Transfer.objects.create(
-        owner=user,
-        recipient=user,
-        subject=dataservices[0],
-        comment="comment",
-    )
-
-    discussion = Discussion.objects.create(
-        subject=dataservices[0],
-        user=user,
-        title="test discussion",
-        discussion=[Message(content=faker.sentence(), posted_by=user)],
-    )
-
-    follower = Follow.objects.create(follower=user, following=dataservices[0])
-
-    HarvestJobFactory(items=[HarvestItem(dataservice=dataservices[0])])
-
-    tasks.purge_dataservices()
 
-    assert Dataservice.objects.count() == 1
-    assert Transfer.objects.filter(id=transfer.id).count() == 0
-    assert Discussion.objects.filter(id=discussion.id).count() == 0
-    assert Follow.objects.filter(id=follower.id).count() == 0
-    assert HarvestJob.objects.filter(items__dataservice=dataservices[0].id).count() == 0
+class DataserviceTasksTest(PytestOnlyDBTestCase):
+    def test_purge_dataservices(self):
+        dataservices = [
+            Dataservice.objects.create(
+                title="delete me", base_api_url="https://example.com/api", deleted_at="2016-01-01"
+            ),
+            Dataservice.objects.create(title="keep me", base_api_url="https://example.com/api"),
+        ]
+
+        user = UserFactory()
+        transfer = Transfer.objects.create(
+            owner=user,
+            recipient=user,
+            subject=dataservices[0],
+            comment="comment",
+        )
+
+        discussion = Discussion.objects.create(
+            subject=dataservices[0],
+            user=user,
+            title="test discussion",
+            discussion=[Message(content=faker.sentence(), posted_by=user)],
+        )
+
+        follower = Follow.objects.create(follower=user, following=dataservices[0])
+
+        HarvestJobFactory(items=[HarvestItem(dataservice=dataservices[0])])
+
+        tasks.purge_dataservices()
+
+        assert Dataservice.objects.count() == 1
+        assert Transfer.objects.filter(id=transfer.id).count() == 0
+        assert Discussion.objects.filter(id=discussion.id).count() == 0
+        assert Follow.objects.filter(id=follower.id).count() == 0
+        assert HarvestJob.objects.filter(items__dataservice=dataservices[0].id).count() == 0

udata/tests/dataset/test_csv_adapter.py

@@ -1,15 +1,12 @@
 from datetime import datetime, timedelta
 
-import pytest
-
 from udata.core.dataset.csv import DatasetCsvAdapter, ResourcesCsvAdapter
 from udata.core.dataset.factories import DatasetFactory, ResourceFactory
 from udata.core.dataset.models import Dataset
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.frontend
-@pytest.mark.usefixtures("clean_db")
-class DatasetCSVAdapterTest:
+class DatasetCSVAdapterTest(PytestOnlyDBTestCase):
     def test_resources_csv_adapter(self):
         date_created = datetime(2022, 12, 31)
         date_modified = date_created + timedelta(days=1)

udata/tests/dataset/test_dataset_actions.py

@@ -1,13 +1,11 @@
-import pytest
-
 from udata.core.dataset.actions import archive
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.discussions.models import Discussion
 from udata.core.user.factories import UserFactory
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.usefixtures("clean_db")
-class DatasetActionsTest:
+class DatasetActionsTest(PytestOnlyDBTestCase):
     def test_dataset_archive(self, app):
         user = UserFactory()
         app.config["ARCHIVE_COMMENT_USER_ID"] = user.id

udata/tests/dataset/test_dataset_commands.py

@@ -1,12 +1,10 @@
 from tempfile import NamedTemporaryFile
 
-import pytest
-
 from udata.core.dataset.factories import DatasetFactory
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.usefixtures("clean_db")
-class DatasetCommandTest:
+class DatasetCommandTest(PytestOnlyDBTestCase):
     def test_dataset_archive_one(self, cli):
         dataset = DatasetFactory()