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

udata/tests/site/test_site_rdf.py

@@ -5,8 +5,8 @@ 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.constants import HVD
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.dataset.models import Dataset
 from udata.core.organization.factories import OrganizationFactory
@@ -14,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)
@@ -142,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"

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()

udata/tests/test_mail.py

@@ -1,120 +1,156 @@
-from contextlib import contextmanager
-from smtplib import SMTPRecipientsRefused
-
 import pytest
 
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.user.factories import UserFactory
-from udata.mail import mail, mail_sent, send
-from udata.tests import DBTestMixin, TestCase
-from udata.tests.helpers import assert_emit, assert_not_emit
-
-SMTPRecipientsRefusedList = ["not-found@udata", "not-found-either@udata"]
-
-
-class FakeSender:
-    def send(self, msg):
-        if all(recipient in SMTPRecipientsRefusedList for recipient in msg.recipients):
-            raise SMTPRecipientsRefused(msg.recipients)
-        mail_sent.send(msg)
-
-
-class FakeMail:
-    @contextmanager
-    def connect(*args, **kw):
-        yield FakeSender()
-
-
-class MailSendTest(TestCase, DBTestMixin):
-    def create_app(self):
-        app = super().create_app()
-        app.config["SEND_MAIL"] = True
-        return app
-
-    @pytest.fixture(autouse=True)
-    def patch_mail(self, mocker):
-        mocker.patch("udata.mail.mail", FakeMail())
-
-    def test_send_mail(self):
-        with assert_emit(mail_sent):
-            send("subject", [UserFactory(email="recipient@udata")], "base")
-
-    def test_send_mail_to_not_found_recipients(self):
-        with assert_not_emit(mail_sent):
-            send("subject", [UserFactory(email="not-found@udata")], "base")
-
-    def test_send_mail_to_multiple_recipients_with_some_not_found(self):
-        recipients = [
-            UserFactory(email="not-found@udata"),
-            UserFactory(email="recipient@udata"),
-            UserFactory(email="not-found-either@udata"),
-        ]
-        with assert_emit(mail_sent):
-            send("subject", recipients, "base")
-
-
-@pytest.mark.usefixtures("clean_db")
-@pytest.mark.frontend
-class MailCampaignTest:
-    def test_send_mail_campaign_link_new_member(self, app):
-        # MTM campaign are only added on web URL (not API ones generated when
-        # no front-end is configured)
-        app.config["CDATA_BASE_URL"] = "https://www.data.gouv.fr"
-
-        org = OrganizationFactory()
-        recipient = UserFactory(email="recipient@udata")
-
-        app.config["SEND_MAIL"] = True
-        app.config["MAIL_CAMPAIGN"] = ""
-        with mail.record_messages() as outbox:
-            send(
-                "subject",
-                [recipient],
-                "new_member",
-                org=org,
+from udata.i18n import lazy_gettext as _
+from udata.mail import LabelledContent, MailMessage, ParagraphWithLinks, send_mail
+from udata.tests.api import APITestCase
+from udata.tests.helpers import capture_mails
+
+
+class MailGenerationTest(APITestCase):
+    @pytest.mark.options(DEFAULT_LANGUAGE="en")
+    def test_simple_mail(self):
+        with capture_mails() as mails:
+            send_mail(
+                UserFactory(email="jane@example.org"),
+                MailMessage(_("Unknown"), paragraphs=[_("Some text")]),
+            )
+
+        assert len(mails) == 1
+        assert len(mails[0].recipients) == 1
+        assert mails[0].recipients[0] == "jane@example.org"
+        assert mails[0].subject == "Unknown"
+        assert "Some text" in mails[0].body
+        assert "Some text" in mails[0].html
+
+    @pytest.mark.options(DEFAULT_LANGUAGE="en")
+    def test_allow_none_in_paragraphs(self):
+        with capture_mails() as mails:
+            send_mail(
+                UserFactory(email="jane@example.org"),
+                MailMessage(_("Unknown"), paragraphs=[_("Some text"), None]),
             )
-        assert len(outbox) == 1
-        message = outbox[0]
-        assert "mtm_campaign" not in message.body
-        assert "mtm_campaign" not in message.html
-
-        app.config["MAIL_CAMPAIGN"] = "data-gouv-fr"
-        with mail.record_messages() as outbox:
-            send(
-                "subject",
-                [recipient],
-                "new_member",
-                org=org,
+
+        assert len(mails) == 1
+
+    @pytest.mark.options(DEFAULT_LANGUAGE="en")
+    def test_multiple_recipients(self):
+        with capture_mails() as mails:
+            send_mail(
+                [
+                    UserFactory(email="jane@example.org"),
+                    UserFactory(email="john@example.org", prefered_language="fr"),
+                ],
+                MailMessage(_("Unknown"), paragraphs=[_("Some text")]),
+            )
+
+        assert len(mails) == 2
+        assert len(mails[0].recipients) == 1
+        assert mails[0].recipients[0] == "jane@example.org"
+        assert mails[0].subject == "Unknown"
+        assert len(mails[1].recipients) == 1
+        assert mails[1].recipients[0] == "john@example.org"
+        assert mails[1].subject == "Inconnu"
+
+    @pytest.mark.options(DEFAULT_LANGUAGE="en")
+    def test_use_user_language(self):
+        with capture_mails() as mails:
+            send_mail(
+                UserFactory(email="jane@example.org", prefered_language="fr"),
+                MailMessage(_("Unknown"), paragraphs=[_("Some text")]),
             )
-        assert len(outbox) == 1
-        message = outbox[0]
-        assert "mtm_campaign=data-gouv-fr" in message.body
-        assert "mtm_campaign=data-gouv-fr" in message.html
-
-    def test_send_mail_campaign_link_badge_added_company(self, app):
-        # MTM campaign are only added on web URL (not API ones generated when
-        # no front-end is configured)
-        app.config["CDATA_BASE_URL"] = "https://www.data.gouv.fr"
-
-        app.config["SEND_MAIL"] = True
-        org = OrganizationFactory()
-        org.add_badge("company")
-        badge = org.badges[0]
-        badge.created_by = UserFactory()
-        recipient = UserFactory(email="recipient@udata")
-
-        app.config["MAIL_CAMPAIGN"] = ""
-        with mail.record_messages() as outbox:
-            send("subject", [recipient], "badge_added_company", organization=org, badge=badge)
-        assert len(outbox) == 1
-        message = outbox[0]
-        assert "mtm_campaign" not in message.body
-        assert "mtm_campaign" not in message.html
-
-        app.config["MAIL_CAMPAIGN"] = "data-gouv-fr"
-        with mail.record_messages() as outbox:
-            send("subject", [recipient], "badge_added_company", organization=org, badge=badge)
-        assert len(outbox) == 1
-        message = outbox[0]
-        assert "mtm_campaign=data-gouv-fr" in message.body
-        assert "mtm_campaign=data-gouv-fr" in message.html
+
+        assert len(mails) == 1
+        assert mails[0].subject == "Inconnu"
+
+    @pytest.mark.options(DEFAULT_LANGUAGE="en")
+    def test_use_objects_in_translations(self):
+        org = OrganizationFactory(name="My Org")
+
+        with capture_mails() as mails:
+            send_mail(
+                UserFactory(email="jane@example.org", prefered_language="fr"),
+                MailMessage(
+                    _("Unknown"),
+                    paragraphs=[ParagraphWithLinks(_("Some text %(org)s", org=org))],
+                ),
+            )
+
+        assert len(mails) == 1
+        assert "My Org" in mails[0].body
+        assert org.url_for() not in mails[0].body
+        assert "My Org" in mails[0].html
+        assert "<a" in mails[0].html
+        assert org.url_for() in mails[0].html
+
+    @pytest.mark.options(DEFAULT_LANGUAGE="en")
+    def test_labelled_bloc(self):
+        with capture_mails() as mails:
+            send_mail(
+                UserFactory(email="jane@example.org", prefered_language="fr"),
+                MailMessage(
+                    _("Unknown"),
+                    paragraphs=[LabelledContent(_("Some text:"), "Some content", inline=True)],
+                ),
+            )
+
+        assert len(mails) == 1
+        assert "<strong>Du texte :</strong> Some content" in mails[0].html
+        assert "Du texte : Some content" in mails[0].body
+
+    @pytest.mark.options(DEFAULT_LANGUAGE="en")
+    def test_labelled_bloc_truncation(self):
+        with capture_mails() as mails:
+            send_mail(
+                UserFactory(email="jane@example.org", prefered_language="fr"),
+                MailMessage(
+                    _("Unknown"),
+                    paragraphs=[
+                        LabelledContent(
+                            _("Some text:"),
+                            """
+                                Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
+                            """,
+                        )
+                    ],
+                ),
+            )
+
+        assert len(mails) == 1
+        assert "a type specimen book." not in mails[0].html
+        assert "a type specimen book." not in mails[0].body
+
+    @pytest.mark.options(DEFAULT_LANGUAGE="en")
+    def test_escape_user_content_in_content(self):
+        with capture_mails() as mails:
+            send_mail(
+                UserFactory(email="jane@example.org", prefered_language="fr"),
+                MailMessage(
+                    _("Unknown"),
+                    paragraphs=[
+                        LabelledContent(
+                            _("Some text:"), "<script>Some content</script>", inline=True
+                        )
+                    ],
+                ),
+            )
+
+        assert len(mails) == 1
+        assert "<script>" not in mails[0].html
+
+    @pytest.mark.options(DEFAULT_LANGUAGE="en")
+    def test_escape_user_content_in_object_label(self):
+        org = OrganizationFactory(name="<script>My Org</script>")
+
+        with capture_mails() as mails:
+            send_mail(
+                UserFactory(email="jane@example.org", prefered_language="fr"),
+                MailMessage(
+                    _("Unknown"),
+                    paragraphs=[ParagraphWithLinks(_("Some text %(org)s", org=org))],
+                ),
+            )
+
+        assert len(mails) == 1
+        assert "<script>" not in mails[0].html