udata 12.0.2.dev10__py3-none-any.whl → 13.0.1.dev21__py3-none-any.whl

udata/tests/site/test_site_model.py

@@ -5,10 +5,10 @@ from flask import current_app, g
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.reuse.factories import ReuseFactory
 from udata.core.site.models import Site, current_site, get_current_site
-from udata.tests import DBTestMixin, TestCase
+from udata.tests.api import DBTestCase
 
 
-class SiteModelTest(DBTestMixin, TestCase):
+class SiteModelTest(DBTestCase):
     def test_current_site(self):
         current_app.config["SITE_ID"] = "old-id"
         current_app.config["SITE_TITLE"] = "Test"

udata/tests/site/test_site_rdf.py

@@ -3,7 +3,9 @@ from flask import url_for
 from rdflib import Graph, Literal, URIRef
 from rdflib.namespace import FOAF, RDF
 from rdflib.resource import Resource
+from werkzeug.datastructures import ImmutableMultiDict
 
+from udata.core.constants import HVD
 from udata.core.dataservices.factories import DataserviceFactory, HarvestMetadataFactory
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.dataset.models import Dataset
@@ -12,13 +14,11 @@ from udata.core.site.factories import SiteFactory
 from udata.core.site.rdf import build_catalog
 from udata.core.user.factories import UserFactory
 from udata.rdf import CONTEXT, DCAT, DCT, HYDRA
+from udata.tests.api import PytestOnlyAPITestCase
 from udata.tests.helpers import assert200, assert404, assert_redirects
 
-pytestmark = pytest.mark.usefixtures("clean_db")
 
-
-@pytest.mark.frontend
-class CatalogTest:
+class CatalogTest(PytestOnlyAPITestCase):
     def test_minimal(self, app):
         site = SiteFactory()
         home_url = url_for("api.site", _external=True)
@@ -77,14 +77,14 @@ class CatalogTest:
         uri = url_for("api.site_rdf_catalog", _external=True)
         uri_first = url_for(
             "api.site_rdf_catalog_format",
-            format="json",
+            _format="json",
             page=1,
             page_size=page_size,
             _external=True,
         )
         uri_last = url_for(
             "api.site_rdf_catalog_format",
-            format="json",
+            _format="json",
             page=2,
             page_size=page_size,
             _external=True,
@@ -93,7 +93,7 @@ class CatalogTest:
 
         # First page
         datasets = Dataset.objects.paginate(1, page_size)
-        catalog = build_catalog(site, datasets, format="json")
+        catalog = build_catalog(site, datasets, _format="json")
         graph = catalog.graph
 
         assert isinstance(catalog, Resource)
@@ -117,7 +117,7 @@ class CatalogTest:
 
         # Second page
         datasets = Dataset.objects.paginate(2, page_size)
-        catalog = build_catalog(site, datasets, format="json")
+        catalog = build_catalog(site, datasets, _format="json")
         graph = catalog.graph
 
         assert isinstance(catalog, Resource)
@@ -140,8 +140,7 @@ class CatalogTest:
         assert HYDRA.next not in pagination
 
 
-@pytest.mark.frontend
-class SiteRdfViewsTest:
+class SiteRdfViewsTest(PytestOnlyAPITestCase):
     def test_expose_jsonld_context(self, client):
         url = url_for("api.site_jsonld_context")
         assert url == "/api/1/site/context.jsonld"
@@ -152,12 +151,39 @@ class SiteRdfViewsTest:
         assert response.json == CONTEXT
 
     def test_catalog_default_to_jsonld(self, client):
-        expected = url_for("api.site_rdf_catalog_format", format="json")
+        expected = url_for("api.site_rdf_catalog_format", _format="json", page=1, page_size=100)
         response = client.get(url_for("api.site_rdf_catalog"))
         assert_redirects(response, expected)
 
+    def test_catalog_redirect_with_filters_sanitizing(self, client):
+        """
+        It should filter out unknown params (including url_for keywords).
+        Repeated keywords should be kept as expected.
+        """
+        expected_params = ImmutableMultiDict(
+            [("page", 3), ("tag", "hvd"), ("tag", "other"), ("page_size", 100)]
+        )
+        expected = url_for(
+            "api.site_rdf_catalog_format", _format="xml", **expected_params.to_dict(flat=False)
+        )
+        params = [
+            ("page", 3),
+            ("tag", "hvd"),
+            ("tag", "other"),
+            ("unknown_param", 5),
+            ("_external", True),
+        ]
+        url = (
+            url_for("api.site_rdf_catalog")
+            + "?"
+            + "&".join(f"{arg}={value}" for arg, value in params)
+        )
+        headers = {"accept": "application/xml"}
+        response = client.get(url, headers=headers)
+        assert_redirects(response, expected)
+
     def test_rdf_perform_content_negociation(self, client):
-        expected = url_for("api.site_rdf_catalog_format", format="xml")
+        expected = url_for("api.site_rdf_catalog_format", _format="xml", page=1, page_size=100)
         url = url_for("api.site_rdf_catalog")
         headers = {"accept": "application/xml"}
         response = client.get(url, headers=headers)
@@ -165,57 +191,65 @@ class SiteRdfViewsTest:
 
     @pytest.mark.parametrize("fmt", ("json", "jsonld"))
     def test_catalog_rdf_json_ld(self, fmt, client):
-        url = url_for("api.site_rdf_catalog_format", format=fmt)
+        url = url_for("api.site_rdf_catalog_format", _format=fmt)
         response = client.get(url, headers={"Accept": "application/ld+json"})
         assert200(response)
         assert response.content_type == "application/ld+json"
         assert response.json["@context"]["@vocab"] == "http://www.w3.org/ns/dcat#"
 
     def test_catalog_rdf_n3(self, client):
-        url = url_for("api.site_rdf_catalog_format", format="n3")
+        url = url_for("api.site_rdf_catalog_format", _format="n3")
         response = client.get(url, headers={"Accept": "text/n3"})
         assert200(response)
         assert response.content_type == "text/n3"
 
     def test_catalog_rdf_turtle(self, client):
-        url = url_for("api.site_rdf_catalog_format", format="ttl")
+        url = url_for("api.site_rdf_catalog_format", _format="ttl")
         response = client.get(url, headers={"Accept": "application/x-turtle"})
         assert200(response)
         assert response.content_type == "application/x-turtle"
 
     @pytest.mark.parametrize("fmt", ("xml", "rdf", "owl"))
     def test_catalog_rdf_rdfxml(self, fmt, client):
-        url = url_for("api.site_rdf_catalog_format", format=fmt)
+        url = url_for("api.site_rdf_catalog_format", _format=fmt)
         response = client.get(url, headers={"Accept": "application/rdf+xml"})
         assert200(response)
         assert response.content_type == "application/rdf+xml"
 
     def test_catalog_rdf_n_triples(self, client):
-        url = url_for("api.site_rdf_catalog_format", format="nt")
+        url = url_for("api.site_rdf_catalog_format", _format="nt")
         response = client.get(url, headers={"Accept": "application/n-triples"})
         assert200(response)
         assert response.content_type == "application/n-triples"
 
     def test_catalog_rdf_trig(self, client):
-        url = url_for("api.site_rdf_catalog_format", format="trig")
+        url = url_for("api.site_rdf_catalog_format", _format="trig")
         response = client.get(url, headers={"Accept": "application/trig"})
         assert200(response)
         assert response.content_type == "application/trig"
 
     @pytest.mark.parametrize("fmt", ("json", "xml", "ttl"))
     def test_dataportal_compliance(self, fmt, client):
-        url = url_for("api.site_dataportal", format=fmt)
+        url = url_for("api.site_dataportal", _format=fmt)
         assert url == "/api/1/site/data.{0}".format(fmt)
-        expected_url = url_for("api.site_rdf_catalog_format", format=fmt)
+        expected_url = url_for("api.site_rdf_catalog_format", _format=fmt)
 
         response = client.get(url)
         assert_redirects(response, expected_url)
 
     def test_catalog_rdf_paginate(self, client):
-        DatasetFactory.create_batch(4)
-        url = url_for("api.site_rdf_catalog_format", format="n3", page_size=3)
+        DatasetFactory.create_batch(4, tags=["my-tag"])
+        DatasetFactory.create_batch(
+            3, tags=["other-tag"]
+        )  # Shouldn't be returned because of the filter on tag="my-tag"
+        url = url_for("api.site_rdf_catalog_format", _format="n3", page_size=3, tag="my-tag")
         next_url = url_for(
-            "api.site_rdf_catalog_format", format="n3", page=2, page_size=3, _external=True
+            "api.site_rdf_catalog_format",
+            _format="n3",
+            page=2,
+            page_size=3,
+            _external=True,
+            tag="my-tag",
         )
 
         response = client.get(url, headers={"Accept": "text/n3"})
@@ -227,16 +261,27 @@ class SiteRdfViewsTest:
         pagination = graph.resource(pagination)
         assert not pagination.value(HYDRA.previous)
         assert pagination.value(HYDRA.next).identifier == URIRef(next_url)
+        assert pagination.value(HYDRA.last).identifier == URIRef(next_url)
+        catalog = graph.value(predicate=RDF.type, object=HYDRA.Collection)
+        assert catalog is not None
+        catalog = graph.resource(catalog)
+        assert catalog.value(HYDRA.totalItems) == Literal(4)
 
     def test_catalog_format_unknown(self, client):
-        url = url_for("api.site_rdf_catalog_format", format="unknown")
+        url = url_for("api.site_rdf_catalog_format", _format="unknown")
         response = client.get(url)
         assert404(response)
 
-    def test_catalog_rdf_filter_tag(self, client):
+    def test_catalog_rdf_filter(self, client):
+        """
+        Test catalog RDF filter on tags and badges
+        """
         DatasetFactory.create_batch(4, tags=["my-tag"])
+        [dat.add_badge(HVD) for dat in DatasetFactory.create_batch(5)]
         DatasetFactory.create_batch(3)
-        url = url_for("api.site_rdf_catalog_format", format="xml", tag="my-tag")
+
+        # Filter on tags
+        url = url_for("api.site_rdf_catalog_format", _format="xml", tag="my-tag")
 
         response = client.get(url, headers={"Accept": "application/xml"})
         assert200(response)
@@ -249,6 +294,17 @@ class SiteRdfViewsTest:
         for dat in datasets:
             assert graph.value(dat, DCAT.keyword) == Literal("my-tag")
 
+        # Filter on badge
+        url = url_for("api.site_rdf_catalog_format", _format="xml", badge=HVD)
+
+        response = client.get(url, headers={"Accept": "application/xml"})
+        assert200(response)
+
+        graph = Graph().parse(data=response.data, format="xml")
+
+        datasets = list(graph.subjects(RDF.type, DCAT.Dataset))
+        assert len(datasets) == 5
+
     def test_catalog_rdf_dataservices(self, client):
         dataset_a = DatasetFactory.create()
         dataset_b = DatasetFactory.create()
@@ -260,7 +316,7 @@ class SiteRdfViewsTest:
         dataservice_y = DataserviceFactory.create(datasets=[])
 
         response = client.get(
-            url_for("api.site_rdf_catalog_format", format="xml"),
+            url_for("api.site_rdf_catalog_format", _format="xml"),
             headers={"Accept": "application/xml"},
         )
         assert200(response)
@@ -280,7 +336,7 @@ class SiteRdfViewsTest:
 
         # Test first page contains the dataservice without dataset
         response = client.get(
-            url_for("api.site_rdf_catalog_format", format="xml", page_size=1),
+            url_for("api.site_rdf_catalog_format", _format="xml", page_size=1),
             headers={"Accept": "application/xml"},
         )
         assert200(response)
@@ -299,7 +355,7 @@ class SiteRdfViewsTest:
 
         # Test second page doesn't contains the dataservice without dataset
         response = client.get(
-            url_for("api.site_rdf_catalog_format", format="xml", page_size=1, page=2),
+            url_for("api.site_rdf_catalog_format", _format="xml", page_size=1, page=2),
             headers={"Accept": "application/xml"},
         )
         assert200(response)

udata/tests/test_activity.py

@@ -9,7 +9,7 @@ from udata.core.activity.models import Activity, Auditable
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.user.factories import UserFactory
 from udata.models import db
-from udata.tests import DBTestMixin, TestCase, WebTestMixin
+from udata.tests.api import APITestCase
 from udata.tests.helpers import assert_emit, assert_not_emit
 
 
@@ -45,7 +45,7 @@ class FakeActivity(Activity):
     related_to = db.ReferenceField(FakeSubject)
 
 
-class ActivityTest(WebTestMixin, DBTestMixin, TestCase):
+class ActivityTest(APITestCase):
     def setUp(self):
         self.fake = FakeSubject.objects.create(name="fake")
         self.login()
@@ -120,7 +120,7 @@ class ActivityTest(WebTestMixin, DBTestMixin, TestCase):
         self.assertEqual(Activity.objects(actor=self.user).count(), 1)
 
 
-class AuditableTest(WebTestMixin, DBTestMixin, TestCase):
+class AuditableTest(APITestCase):
     def test_auditable_signals_emission(self):
         """It should emit appropriate signals on subject fields creation, update and deletion"""
         with assert_emit(post_save, FakeAuditableSubject.on_create):

udata/tests/test_api_fields.py

@@ -13,12 +13,9 @@ from udata.core.storages import default_image_basename, images
 from udata.factories import ModelFactory
 from udata.models import Badge, BadgeMixin, BadgesList, WithMetrics, db
 from udata.mongo.queryset import DBPaginator, UDataQuerySet
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.utils import faker
 
-pytestmark = [
-    pytest.mark.usefixtures("clean_db"),
-]
-
 BIGGEST_IMAGE_SIZE: int = 500
 
 BADGES: dict[str, str] = {
@@ -166,7 +163,7 @@ class FakeFactory(ModelFactory):
     archived = None
 
 
-class IndexParserTest:
+class IndexParserTest(PytestOnlyDBTestCase):
     index_parser: RequestParser = Fake.__index_parser__
     index_parser_args: list[Argument] = Fake.__index_parser__.args
     index_parser_args_names: set[str] = set([field.name for field in Fake.__index_parser__.args])
@@ -233,7 +230,7 @@ class IndexParserTest:
         assert set(additional_sorts).issubset(set(choices))
 
 
-class PatchTest:
+class PatchTest(PytestOnlyDBTestCase):
     fake_json = {"url": URL_RAISE_ERROR, "description": None}
 
     def test_patch_check(self) -> None:
@@ -249,7 +246,7 @@ class PatchTest:
             patch_and_save(fake, fake_request)
 
 
-class PatchEmbeddedTest:
+class PatchEmbeddedTest(PytestOnlyDBTestCase):
     fake_json = {
         "url": URL_RAISE_ERROR,
         "description": "desc",
@@ -268,7 +265,7 @@ class PatchEmbeddedTest:
         patch_and_save(fake, fake_request)
 
 
-class ApplySortAndFiltersTest:
+class ApplySortAndFiltersTest(PytestOnlyDBTestCase):
     def test_filterable_field(self, app) -> None:
         """A filterable field filters the results."""
         fake1: Fake = FakeFactory(filter_field="test filter")
@@ -334,7 +331,7 @@ class ApplySortAndFiltersTest:
             assert fake2 not in results
 
 
-class ApplyPaginationTest:
+class ApplyPaginationTest(PytestOnlyDBTestCase):
     def test_default_pagination(self, app) -> None:
         """Results should be returned with default pagination."""
         [FakeFactory() for _ in range(100)]

udata/tests/test_cors.py

@@ -8,8 +8,6 @@ from udata.tests.helpers import assert_status
 
 
 class CorsTest(APITestCase):
-    modules = []
-
     def test_cors_on_allowed_routes(self):
         cors_headers = {
             "Origin": "http://localhost",

udata/tests/test_dcat_commands.py

@@ -1,8 +1,7 @@
-import pytest
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.usefixtures("clean_db")
-class ParseUrlCommandTest:
+class ParseUrlCommandTest(PytestOnlyDBTestCase):
     def test_parse_url(self, cli, requests_mock, caplog) -> None:
         logs = []
 

udata/tests/test_discussions.py

@@ -31,14 +31,11 @@ from udata.models import Dataset, Member
 from udata.tests.helpers import capture_mails
 from udata.utils import faker
 
-from . import DBTestMixin, TestCase
-from .api import APITestCase
+from .api import APITestCase, DBTestCase
 from .helpers import assert_emit, assert_not_emit
 
 
 class DiscussionsTest(APITestCase):
-    modules = []
-
     @pytest.mark.options(SPAM_WORDS=["spam"])
     def test_new_discussion(self):
         user = self.login()
@@ -1018,7 +1015,7 @@ class DiscussionsTest(APITestCase):
         self.assert403(response)
 
 
-class DiscussionsNotificationsTest(TestCase, DBTestMixin):
+class DiscussionsNotificationsTest(DBTestCase):
     def test_notify_user_discussions(self):
         owner = UserFactory()
         dataset = DatasetFactory(owner=owner)
@@ -1091,8 +1088,6 @@ class DiscussionsNotificationsTest(TestCase, DBTestMixin):
 
 
 class DiscussionsMailsTest(APITestCase):
-    modules = []
-
     def test_new_discussion_mail(self):
         user = UserFactory()
         owner = UserFactory()