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

udata/tests/metrics/test_tasks.py

@@ -12,160 +12,164 @@ from udata.core.metrics.tasks import (
 )
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.reuse.factories import ReuseFactory
+from udata.tests import PytestOnlyTestCase
 
 from .helpers import mock_metrics_api
 
 
-def test_iterate_on_metrics(app, rmock):
-    mock_metrics_api(
-        app,
-        rmock,
-        "test_model",
-        ["test_key", "second_key"],
+@pytest.mark.options(METRICS_API="http://metrics-api.fr/api")
+class TasksMetricsTest(PytestOnlyTestCase):
+    def test_iterate_on_metrics(self, app, rmock):
+        mock_metrics_api(
+            app,
+            rmock,
+            "test_model",
+            ["test_key", "second_key"],
+            [
+                {"id": 123},
+                {"id": 42},
+                {"id": 1337},
+            ],
+            page_size=2,
+        )
+
+        metrics_data = list(
+            iterate_on_metrics("test_model", ["test_key", "second_key"], page_size=2)
+        )
+
+        assert metrics_data == [
+            {"__id": 0, "id": 123},
+            {"__id": 1, "id": 42},
+            {"__id": 2, "id": 1337},
+        ]
+
+    @pytest.mark.parametrize(
+        "endpoint,id_key,factory,func,api_key",
         [
-            {"id": 123},
-            {"id": 42},
-            {"id": 1337},
+            ("dataservices", "dataservice_id", DataserviceFactory, update_dataservices, "visit"),
+            ("reuses", "reuse_id", ReuseFactory, update_reuses, "visit"),
+            (
+                "organizations",
+                "organization_id",
+                OrganizationFactory,
+                update_organizations,
+                "visit_dataset",
+            ),
         ],
-        page_size=2,
     )
-
-    metrics_data = list(iterate_on_metrics("test_model", ["test_key", "second_key"], page_size=2))
-
-    assert metrics_data == [
-        {"__id": 0, "id": 123},
-        {"__id": 1, "id": 42},
-        {"__id": 2, "id": 1337},
-    ]
-
-
-@pytest.mark.parametrize(
-    "endpoint,id_key,factory,func,api_key",
-    [
-        ("dataservices", "dataservice_id", DataserviceFactory, update_dataservices, "visit"),
-        ("reuses", "reuse_id", ReuseFactory, update_reuses, "visit"),
-        (
-            "organizations",
-            "organization_id",
-            OrganizationFactory,
-            update_organizations,
-            "visit_dataset",
-        ),
-    ],
-)
-def test_update_simple_visit_to_views_metrics(app, rmock, endpoint, id_key, factory, func, api_key):
-    models = [factory() for i in range(15)]
-    mock_metrics_api(
-        app,
-        rmock,
-        endpoint,
-        [api_key],
-        [
-            {id_key: str(models[1].id), api_key: 42},
-            {id_key: str(models[3].id), api_key: 1337},
-            {id_key: str(models[4].id), api_key: 2},
-        ],
-    )
-
-    func()
-    [model.reload() for model in models]
-
-    assert models[1].metrics.get("views") == 42
-    assert models[3].metrics.get("views") == 1337
-    assert models[4].metrics.get("views") == 2
-
-
-def test_update_datasets(app, rmock):
-    datasets = [DatasetFactory() for i in range(15)]
-    mock_metrics_api(
-        app,
-        rmock,
-        "datasets",
-        ["visit", "download_resource"],
-        [
-            {"dataset_id": str(datasets[1].id), "visit": 42, "download_resource": 123},
-            {"dataset_id": str(datasets[3].id), "visit": 1337, "download_resource": 4242},
-            {"dataset_id": str(datasets[4].id), "visit": 2, "download_resource": 7},
-        ],
-    )
-
-    update_datasets()
-    [model.reload() for model in datasets]
-
-    assert datasets[1].metrics.get("views") == 42
-    assert datasets[1].metrics.get("resources_downloads") == 123
-    assert datasets[3].metrics.get("views") == 1337
-    assert datasets[3].metrics.get("resources_downloads") == 4242
-    assert datasets[4].metrics.get("views") == 2
-    assert datasets[4].metrics.get("resources_downloads") == 7
-
-
-def test_update_resources_metrics(app, rmock):
-    resources = [ResourceFactory() for i in range(5)]
-    dataset_a_with_resources = DatasetFactory(resources=resources)
-    dataset_b_with_resource = DatasetFactory(resources=[ResourceFactory()])
-
-    community_resources = [CommunityResourceFactory() for i in range(10)]
-
-    dataset_without_resource = DatasetFactory()
-
-    mock_metrics_api(
-        app,
-        rmock,
-        "resources",
-        ["download_resource"],
-        [
-            {
-                "resource_id": str(dataset_a_with_resources.resources[0].id),
-                "dataset_id": str(dataset_a_with_resources.id),
-                "download_resource": 42,
-            },
-            {
-                "resource_id": str(community_resources[3].id),
-                "dataset_id": None,
-                "download_resource": 16,
-            },
-            {
-                "resource_id": str(community_resources[5].id),
-                "dataset_id": None,
-                "download_resource": 111,
-            },
-            {
-                "resource_id": str(dataset_a_with_resources.resources[1].id),
-                "dataset_id": str(dataset_a_with_resources.id),
-                "download_resource": 1337,
-            },
-            {
-                "resource_id": str(dataset_b_with_resource.resources[0].id),
-                "dataset_id": str(dataset_b_with_resource.id),
-                "download_resource": 1404,
-            },
-            {
-                "resource_id": str(dataset_a_with_resources.resources[4].id),
-                "dataset_id": str(dataset_a_with_resources.id),
-                "download_resource": 2,
-            },
-            {
-                "resource_id": str(community_resources[9].id),
-                "dataset_id": None,
-                "download_resource": 1,
-            },
-        ],
-    )
-
-    update_resources_and_community_resources()
-
-    dataset_a_with_resources.reload()
-    dataset_b_with_resource.reload()
-    dataset_without_resource.reload()
-    [community_resource.reload() for community_resource in community_resources]
-
-    assert community_resources[3].metrics.get("views") == 16
-    assert community_resources[5].metrics.get("views") == 111
-    assert community_resources[9].metrics.get("views") == 1
-
-    assert dataset_a_with_resources.resources[0].metrics.get("views") == 42
-    assert dataset_a_with_resources.resources[1].metrics.get("views") == 1337
-    assert dataset_a_with_resources.resources[4].metrics.get("views") == 2
-
-    assert dataset_b_with_resource.resources[0].metrics.get("views") == 1404
+    def test_update_simple_visit_to_views_metrics(
+        self, app, rmock, endpoint, id_key, factory, func, api_key
+    ):
+        models = [factory() for i in range(15)]
+        mock_metrics_api(
+            app,
+            rmock,
+            endpoint,
+            [api_key],
+            [
+                {id_key: str(models[1].id), api_key: 42},
+                {id_key: str(models[3].id), api_key: 1337},
+                {id_key: str(models[4].id), api_key: 2},
+            ],
+        )
+
+        func()
+        [model.reload() for model in models]
+
+        assert models[1].metrics.get("views") == 42
+        assert models[3].metrics.get("views") == 1337
+        assert models[4].metrics.get("views") == 2
+
+    def test_update_datasets(self, app, rmock):
+        datasets = [DatasetFactory() for i in range(15)]
+        mock_metrics_api(
+            app,
+            rmock,
+            "datasets",
+            ["visit", "download_resource"],
+            [
+                {"dataset_id": str(datasets[1].id), "visit": 42, "download_resource": 123},
+                {"dataset_id": str(datasets[3].id), "visit": 1337, "download_resource": 4242},
+                {"dataset_id": str(datasets[4].id), "visit": 2, "download_resource": 7},
+            ],
+        )
+
+        update_datasets()
+        [model.reload() for model in datasets]
+
+        assert datasets[1].metrics.get("views") == 42
+        assert datasets[1].metrics.get("resources_downloads") == 123
+        assert datasets[3].metrics.get("views") == 1337
+        assert datasets[3].metrics.get("resources_downloads") == 4242
+        assert datasets[4].metrics.get("views") == 2
+        assert datasets[4].metrics.get("resources_downloads") == 7
+
+    def test_update_resources_metrics(self, app, rmock):
+        resources = [ResourceFactory() for i in range(5)]
+        dataset_a_with_resources = DatasetFactory(resources=resources)
+        dataset_b_with_resource = DatasetFactory(resources=[ResourceFactory()])
+
+        community_resources = [CommunityResourceFactory() for i in range(10)]
+
+        dataset_without_resource = DatasetFactory()
+
+        mock_metrics_api(
+            app,
+            rmock,
+            "resources",
+            ["download_resource"],
+            [
+                {
+                    "resource_id": str(dataset_a_with_resources.resources[0].id),
+                    "dataset_id": str(dataset_a_with_resources.id),
+                    "download_resource": 42,
+                },
+                {
+                    "resource_id": str(community_resources[3].id),
+                    "dataset_id": None,
+                    "download_resource": 16,
+                },
+                {
+                    "resource_id": str(community_resources[5].id),
+                    "dataset_id": None,
+                    "download_resource": 111,
+                },
+                {
+                    "resource_id": str(dataset_a_with_resources.resources[1].id),
+                    "dataset_id": str(dataset_a_with_resources.id),
+                    "download_resource": 1337,
+                },
+                {
+                    "resource_id": str(dataset_b_with_resource.resources[0].id),
+                    "dataset_id": str(dataset_b_with_resource.id),
+                    "download_resource": 1404,
+                },
+                {
+                    "resource_id": str(dataset_a_with_resources.resources[4].id),
+                    "dataset_id": str(dataset_a_with_resources.id),
+                    "download_resource": 2,
+                },
+                {
+                    "resource_id": str(community_resources[9].id),
+                    "dataset_id": None,
+                    "download_resource": 1,
+                },
+            ],
+        )
+
+        update_resources_and_community_resources()
+
+        dataset_a_with_resources.reload()
+        dataset_b_with_resource.reload()
+        dataset_without_resource.reload()
+        [community_resource.reload() for community_resource in community_resources]
+
+        assert community_resources[3].metrics.get("views") == 16
+        assert community_resources[5].metrics.get("views") == 111
+        assert community_resources[9].metrics.get("views") == 1
+
+        assert dataset_a_with_resources.resources[0].metrics.get("views") == 42
+        assert dataset_a_with_resources.resources[1].metrics.get("views") == 1337
+        assert dataset_a_with_resources.resources[4].metrics.get("views") == 2
+
+        assert dataset_b_with_resource.resources[0].metrics.get("views") == 1404

udata/tests/organization/test_csv_adapter.py

@@ -1,14 +1,11 @@
-import pytest
-
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.organization.csv import OrganizationCsvAdapter
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.organization.models import Organization
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.frontend
-@pytest.mark.usefixtures("clean_db")
-class OrganizationCSVAdapterTest:
+class OrganizationCSVAdapterTest(PytestOnlyDBTestCase):
     def test_organization_downloads_counts(self):
         org_with_dataset = OrganizationFactory()
         org_without_dataset = OrganizationFactory()

udata/tests/organization/test_notifications.py

@@ -1,14 +1,12 @@
-import pytest
-
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.organization.notifications import membership_request_notifications
 from udata.core.user.factories import UserFactory
 from udata.models import Member, MembershipRequest
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.tests.helpers import assert_equal_dates
 
 
-@pytest.mark.usefixtures("clean_db")
-class OrganizationNotificationsTest:
+class OrganizationNotificationsTest(PytestOnlyDBTestCase):
     def test_pending_membership_requests(self):
         admin = UserFactory()
         editor = UserFactory()

udata/tests/organization/test_organization_model.py

@@ -12,12 +12,11 @@ from udata.core.organization.models import Organization, OrganizationBadge
 from udata.core.reuse.factories import ReuseFactory, VisibleReuseFactory
 from udata.core.user.factories import UserFactory
 from udata.models import Dataset, Follow, Member, Reuse, db
+from udata.tests.api import DBTestCase
 from udata.tests.helpers import assert_emit
 
-from .. import DBTestMixin, TestCase
 
-
-class OrganizationModelTest(TestCase, DBTestMixin):
+class OrganizationModelTest(DBTestCase):
     # Load metrics
     import udata.core.organization.metrics  # noqa
     import udata.core.followers.metrics  # noqa
@@ -88,7 +87,7 @@ class OrganizationModelTest(TestCase, DBTestMixin):
             OrganizationFactory(url="not-an-url")
 
 
-class OrganizationBadgeTest(DBTestMixin, TestCase):
+class OrganizationBadgeTest(DBTestCase):
     # Model badges can be extended in plugins, for example in udata-front
     # for french only badges.
     Organization.__badges__["new"] = "new"

udata/tests/organization/test_organization_rdf.py

@@ -3,7 +3,6 @@ from rdflib import BNode, Literal, URIRef
 from rdflib.namespace import FOAF, RDF, RDFS
 from rdflib.resource import Resource as RdfResource
 
-from udata import api
 from udata.core.dataservices.factories import DataserviceFactory
 from udata.core.dataservices.models import Dataservice
 from udata.core.dataset.factories import DatasetFactory
@@ -11,16 +10,11 @@ from udata.core.dataset.models import Dataset
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.organization.rdf import build_org_catalog, organization_to_rdf
 from udata.rdf import DCAT, DCT, HYDRA
-from udata.tests import DBTestMixin, TestCase
+from udata.tests.api import APITestCase
 from udata.utils import faker
 
 
-class OrganizationToRdfTest(DBTestMixin, TestCase):
-    def create_app(self):
-        app = super(OrganizationToRdfTest, self).create_app()
-        api.init_app(app)
-        return app
-
+class OrganizationToRdfTest(APITestCase):
     def test_minimal(self):
         org = OrganizationFactory.build()  # Does not have an URL
         o = organization_to_rdf(org)

udata/tests/plugin.py

@@ -1,44 +1,33 @@
 import shlex
 from contextlib import contextmanager
-from urllib.parse import urlparse
 
 import pytest
 from flask import current_app, json, template_rendered, url_for
 from flask.testing import FlaskClient
 from flask_principal import Identity, identity_changed
 from lxml import etree
-from werkzeug.urls import url_encode
 
-from udata import settings
-from udata.app import create_app
 from udata.core.user.factories import UserFactory
-from udata.mongo import db
-from udata.mongo.document import get_all_models
 
 from .helpers import assert200, assert_command_ok
 
 
 class TestClient(FlaskClient):
-    def _build_url(self, url, kwargs):
-        if "qs" not in kwargs:
-            return url
-        qs = kwargs.pop("qs")
-        return "?".join([url, url_encode(qs)])
+    """
+    The goal of these `post`, `put` and `delete` functions is to
+    switch from `data` in kwargs to `data` in args and be able to
+    `client.post(url, data)` without doing `client.post(url, data=data)`
 
-    def get(self, url, **kwargs):
-        url = self._build_url(url, kwargs)
-        return super(TestClient, self).get(url, **kwargs)
+    Same as in :TestClientOverride
+    """
 
     def post(self, url, data=None, **kwargs):
-        url = self._build_url(url, kwargs)
         return super(TestClient, self).post(url, data=data, **kwargs)
 
     def put(self, url, data=None, **kwargs):
-        url = self._build_url(url, kwargs)
         return super(TestClient, self).put(url, data=data, **kwargs)
 
     def delete(self, url, data=None, **kwargs):
-        url = self._build_url(url, kwargs)
         return super(TestClient, self).delete(url, data=data, **kwargs)
 
     def login(self, user=None):
@@ -60,38 +49,6 @@ class TestClient(FlaskClient):
             del session["_id"]
 
 
-@pytest.fixture
-def app(request):
-    test_settings = get_settings(request)
-    app = create_app(settings.Defaults, override=test_settings)
-    app.test_client_class = TestClient
-    return app
-
-
-@pytest.fixture(autouse=True)
-def _load_frontend(request, _configure_application):
-    """
-    Use `pytest.mark.frontend` to specify that frontend/api should be loaded
-    Pass an optionnal list of modules as parameter to restrict loaded modules.
-
-    Handle backward compatibility with Class.modules attribute too
-    """
-    if "app" not in request.fixturenames:
-        return
-
-    app = request.getfixturevalue("app")
-    marker = request.node.get_closest_marker("frontend")
-    modules = set(marker.args[0] if marker and marker.args else [])
-    if getattr(request.cls, "modules", None):
-        modules |= set(request.cls.modules)
-
-    if marker or hasattr(request.cls, "modules"):
-        from udata import api, frontend
-
-        api.init_app(app)
-        frontend.init_app(app, modules)
-
-
 @pytest.fixture
 def client(app):
     """
@@ -100,67 +57,6 @@ def client(app):
     return app.test_client()
 
 
-def get_settings(request):
-    """
-    Extract settings from the current test request
-    """
-    marker = request.node.get_closest_marker("settings")
-    if marker:
-        return marker.args[0]
-    _settings = getattr(request.cls, "settings", settings.Testing)
-    # apply the options(plugins) marker from pytest_flask as soon as app is created
-    # https://github.com/pytest-dev/pytest-flask/blob/a62ea18cb0fe89e3f3911192ab9ea4f9b12f8a16/pytest_flask/plugin.py#L126
-    # this lets us have default settings for plugins applied while testing
-    plugins = getattr(_settings, "PLUGINS", [])
-    for options in request.node.iter_markers("options"):
-        option = options.kwargs.get("plugins", []) or options.kwargs.get("PLUGINS", [])
-        plugins += option
-    setattr(_settings, "PLUGINS", plugins)
-    return _settings
-
-
-def drop_db(app):
-    """Clear the database"""
-    parsed_url = urlparse(app.config["MONGODB_HOST"])
-
-    # drop the leading /
-    db_name = parsed_url.path[1:]
-    db.connection.drop_database(db_name)
-
-
-@pytest.fixture
-def clean_db(app):
-    drop_db(app)
-    for model in get_all_models():
-        # When dropping the database, MongoEngine will keep the collection cached inside
-        # `_collection` (in memory). This cache is used to call `ensure_indexes` only on the
-        # first call to `_get_collection()`, on subsequent calls the value inside `_collection`
-        # is returned without calling `ensure_indexes`.
-        # In tests, the first test will have a clean memory state, so MongoEngine will initialise
-        # the collection and create the indexes, then the following test, with a clean database (no indexes)
-        # will have the collection cached, so MongoEngine will never create the indexes (except if `auto_create_index_on_save`
-        # is set on the model, which may be the reason it is present on most of the big models, we may remove it?)
-        model._collection = None
-
-    yield
-
-
-@pytest.fixture(name="db")
-def raw_db(app, clean_db):
-    """Access to raw PyMongo DB client"""
-    from mongoengine.connection import get_db
-
-    yield get_db()
-    drop_db(app)
-
-
-@pytest.fixture
-def enable_resource_event(app):
-    """Enable resource event"""
-    app.config["PUBLISH_ON_RESOURCE_EVENTS"] = True
-    app.config["RESOURCES_ANALYSER_URI"] = "http://local.dev"
-
-
 class ApiClient(object):
     def __init__(self, client):
         self.client = client

udata/tests/reuse/test_reuse_model.py

@@ -12,12 +12,11 @@ from udata.core.reuse.models import Reuse, ReuseBadge
 from udata.core.user.factories import UserFactory
 from udata.i18n import gettext as _
 from udata.models import db
+from udata.tests.api import DBTestCase
 from udata.tests.helpers import assert_emit
 
-from .. import DBTestMixin, TestCase
 
-
-class ReuseModelTest(TestCase, DBTestMixin):
+class ReuseModelTest(DBTestCase):
     def test_owned_by_user(self):
         user = UserFactory()
         reuse = ReuseFactory(owner=user)
@@ -135,7 +134,7 @@ class ReuseModelTest(TestCase, DBTestMixin):
             ReuseFactory(url="not-an-url")
 
 
-class ReuseBadgeTest(DBTestMixin, TestCase):
+class ReuseBadgeTest(DBTestCase):
     # Model badges can be extended in plugins, for example in udata-front
     # for french only badges.
     Reuse.__badges__["new"] = "new"

udata/tests/site/test_site_api.py

@@ -7,8 +7,6 @@ from udata.tests.api import APITestCase
 
 
 class SiteAPITest(APITestCase):
-    modules = []
-
     def test_get_site(self):
         response = self.get(url_for("api.site"))
         self.assert200(response)

udata/tests/site/test_site_csv_exports.py

@@ -15,8 +15,6 @@ from udata.tests.api import APITestCase
 
 
 class SiteCsvExportsTest(APITestCase):
-    modules = []
-
     def test_datasets_csv(self):
         self.app.config["EXPORT_CSV_MODELS"] = []
         datasets = [DatasetFactory(resources=[ResourceFactory()]) for _ in range(5)]

udata/tests/site/test_site_metrics.py

@@ -1,5 +1,3 @@
-import pytest
-
 from udata.core.dataservices.factories import DataserviceFactory
 from udata.core.dataset.factories import (
     DatasetFactory,
@@ -10,10 +8,10 @@ from udata.core.organization.constants import PUBLIC_SERVICE
 from udata.core.reuse.factories import VisibleReuseFactory
 from udata.core.site.factories import SiteFactory
 from udata.harvest.tests.factories import HarvestSourceFactory
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-@pytest.mark.usefixtures("clean_db")
-class SiteMetricTest:
+class SiteMetricTest(PytestOnlyDBTestCase):
     def test_orga_metric(self, app):
         site = SiteFactory.create(id=app.config["SITE_ID"])
         OrganizationFactory.create_batch(3)

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"