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

udata/tests/forms/test_image_field.py

@@ -7,6 +7,7 @@ from udata.core.storages import tmp
 from udata.forms import Form
 from udata.forms.fields import ImageField
 from udata.mongo import db
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.tests.helpers import data_path
 
 log = logging.getLogger(__name__)
@@ -24,8 +25,7 @@ class PostData(dict):
         return value
 
 
-@pytest.mark.usefixtures("clean_db")
-class ImageFieldTest:
+class ImageFieldTest(PytestOnlyDBTestCase):
     class D(db.Document):
         image = db.ImageField(fs=storage)
         thumbnail = db.ImageField(fs=storage, thumbnails=SIZES)

udata/tests/forms/test_model_field.py

@@ -1,11 +1,9 @@
-import pytest
 from werkzeug.datastructures import MultiDict
 
 from udata.forms import ModelForm, fields
 from udata.i18n import gettext as _
 from udata.mongo import db
-
-pytestmark = [pytest.mark.usefixtures("clean_db")]
+from udata.tests.api import PytestOnlyDBTestCase
 
 
 class Target(db.Document):
@@ -233,7 +231,7 @@ class Optionnal:
         assert model.target is None
 
 
-class CommonMixin:
+class CommonMixin(PytestOnlyDBTestCase):
     @property
     def form(self):
         validators = [fields.validators.DataRequired()] if self.required else []

udata/tests/forms/test_publish_as_field.py

@@ -1,4 +1,3 @@
-import pytest
 from bson import ObjectId
 from werkzeug.datastructures import MultiDict
 
@@ -8,10 +7,10 @@ from udata.core.user.factories import AdminFactory, UserFactory
 from udata.forms import ModelForm, fields
 from udata.i18n import gettext as _
 from udata.models import Member, Organization, User, db
-from udata.tests import TestCase
+from udata.tests.api import DBTestCase
 
 
-class PublishFieldTest(TestCase):
+class PublishFieldTest(DBTestCase):
     def factory(self, *args, **kwargs):
         class Ownable(db.Document):
             owner = db.ReferenceField(User)
@@ -194,7 +193,6 @@ class PublishFieldTest(TestCase):
         self.assertIn("organization", form.errors)
         self.assertEqual(len(form.errors["organization"]), 1)
 
-    @pytest.mark.usefixtures("clean_db")
     def test_with_initial_and_both_member(self):
         Ownable, OwnableForm = self.factory()
         user = UserFactory()

udata/tests/forms/test_user_forms.py

@@ -1,34 +1,31 @@
-import pytest
-
 from udata.auth.forms import ExtendedRegisterForm
 from udata.core.user.forms import UserProfileForm
+from udata.tests.api import PytestOnlyDBTestCase
 
-pytestmark = [pytest.mark.usefixtures("clean_db")]
-
-
-def test_register_form_accepts_no_url():
-    form = ExtendedRegisterForm.from_json(
-        {
-            "email": "a@a.fr",
-            "password": "passpass",
-            "password_confirm": "passpass",
-            "first_name": "azeaezr http://dumdum.fr",
-            "last_name": "azeaze https://etalab.studio",
-        }
-    )
-    form.validate()
-    assert "first_name" in form.errors and "last_name" in form.errors
 
+class UserFormsTest(PytestOnlyDBTestCase):
+    def test_register_form_accepts_no_url(self):
+        form = ExtendedRegisterForm.from_json(
+            {
+                "email": "a@a.fr",
+                "password": "passpass",
+                "password_confirm": "passpass",
+                "first_name": "azeaezr http://dumdum.fr",
+                "last_name": "azeaze https://etalab.studio",
+            }
+        )
+        form.validate()
+        assert "first_name" in form.errors and "last_name" in form.errors
 
-def test_user_profile_form_accepts_no_url():
-    form = UserProfileForm.from_json(
-        {
-            "email": "a@a.fr",
-            "password": "passpass",
-            "password_confirm": "passpass",
-            "first_name": "azeaezr http://dumdum.fr",
-            "last_name": "azeaze https://etalab.studio",
-        }
-    )
-    form.validate()
-    assert "first_name" in form.errors and "last_name" in form.errors
+    def test_user_profile_form_accepts_no_url(self):
+        form = UserProfileForm.from_json(
+            {
+                "email": "a@a.fr",
+                "password": "passpass",
+                "password_confirm": "passpass",
+                "first_name": "azeaezr http://dumdum.fr",
+                "last_name": "azeaze https://etalab.studio",
+            }
+        )
+        form.validate()
+        assert "first_name" in form.errors and "last_name" in form.errors

udata/tests/frontend/test_auth.py

@@ -2,11 +2,10 @@ from flask import current_app, url_for
 from flask_security.utils import hash_data
 
 from udata.core.user.factories import AdminFactory
+from udata.tests.api import APITestCase
 
-from . import FrontTestCase
 
-
-class AuthTest(FrontTestCase):
+class AuthTest(APITestCase):
     def test_change_mail(self):
         user = self.login(AdminFactory())
 

udata/tests/frontend/test_csv.py

@@ -3,15 +3,15 @@ from io import StringIO
 from random import randint
 
 import factory
+import pytest
 from factory.mongoengine import MongoEngineFactory
 from flask import Blueprint, url_for
 
 from udata.core import csv
 from udata.mongo import db
+from udata.tests.api import APITestCase
 from udata.utils import faker
 
-from . import FrontTestCase
-
 RE_ATTACHMENT = re.compile(r"^attachment; filename=(?P<filename>.*)$")
 RE_FILENAME = re.compile(r"^(?P<basename>.*)-\d{4}-\d{2}-\d{2}-\d{2}-\d{2}\.csv$")
 
@@ -107,11 +107,10 @@ def with_basename():
     return csv.stream(adapter, "test")
 
 
-class CsvTest(FrontTestCase):
-    def create_app(self):
-        app = super(CsvTest, self).create_app()
+class CsvTest(APITestCase):
+    @pytest.fixture(autouse=True)
+    def setup_func(self, app):
         app.register_blueprint(blueprint)
-        return app
 
     def test_adapter_fields_as_list(self):
         @csv.adapter(Fake)

udata/tests/frontend/test_error_handlers.py

@@ -3,11 +3,10 @@ from uuid import uuid4
 from flask import url_for
 
 from udata.i18n import _
+from udata.tests.api import APITestCase
 
-from . import FrontTestCase
 
-
-class ErrorHandlersTest(FrontTestCase):
+class ErrorHandlersTest(APITestCase):
     def test_404_in_flask_routing_requesting_html(self):
         """Test that a 404 error displays the custom 404 HTML page"""
         # Request a non-existent page

udata/tests/frontend/test_hooks.py

@@ -2,6 +2,7 @@ import pytest
 from flask import Blueprint, render_template_string, url_for
 
 from udata.frontend import template_hook
+from udata.tests.api import PytestOnlyAPITestCase
 from udata.tests.helpers import assert200
 
 bp = Blueprint("hooks_tests", __name__, url_prefix="/hooks_tests")
@@ -92,14 +93,11 @@ def iter_conditionnal():
     return render_template_string('{% for w in hook("conditionnal") %}<{{ w }}>{% endfor %}')
 
 
-@pytest.fixture
-def app(app):
-    app.register_blueprint(bp)
-    return app
+class HooksTest(PytestOnlyAPITestCase):
+    @pytest.fixture(autouse=True)
+    def setup_func(self, app):
+        app.register_blueprint(bp)
 
-
-@pytest.mark.frontend
-class HooksTest:
     def test_empty_template_hook(self, client):
         response = client.get(url_for("hooks_tests.render_empty"))
         assert200(response)

udata/tests/frontend/test_markdown.py

@@ -3,6 +3,7 @@ from bleach._vendor import html5lib
 from flask import render_template_string
 
 from udata.frontend.markdown import EXCERPT_TOKEN, md, parse_html
+from udata.tests.api import PytestOnlyAPITestCase
 from udata.utils import faker
 
 parser = html5lib.HTMLParser(tree=html5lib.getTreeBuilder("dom"))
@@ -38,8 +39,7 @@ def md2dom(app):
     return helper
 
 
-@pytest.mark.frontend
-class MarkdownTest:
+class MarkdownTest(PytestOnlyAPITestCase):
     def test_excerpt_is_not_removed(self, app):
         with app.test_request_context("/"):
             assert_md_equal(md(EXCERPT_TOKEN), EXCERPT_TOKEN)
@@ -279,8 +279,7 @@ class MarkdownTest:
         assert_md(text, expected)
 
 
-@pytest.mark.frontend
-class MdStripTest:
+class MdStripTest(PytestOnlyAPITestCase):
     def test_mdstrip_filter(self, app):
         """mdstrip should truncate the text before rendering"""
         text = "1 2 3 4 5 6 7 8 9 0"

udata/tests/helpers.py

@@ -2,10 +2,10 @@ import os
 from contextlib import contextmanager
 from datetime import timedelta
 from io import BytesIO
-from urllib.parse import parse_qs, urljoin, urlparse
+from urllib.parse import parse_qs, urlparse
 
 import mock
-from flask import current_app, json, request, url_for
+from flask import current_app, json
 from flask_security.babel import FsDomain
 from PIL import Image
 
@@ -182,11 +182,6 @@ def assert500(response):
     assert_status(response, 500)
 
 
-def full_url(*args, **kwargs):
-    """Build a full URL"""
-    return urljoin(request.url_root, url_for(*args, **kwargs))
-
-
 def data_path(filename):
     """Get a test data path"""
     return os.path.join(os.path.dirname(__file__), "data", filename)

udata/tests/metrics/test_metrics.py

@@ -9,59 +9,63 @@ from udata.core.metrics.helpers import get_metrics_for_model, get_stock_metrics
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.reuse.factories import ReuseFactory
 from udata.models import Dataset, Organization, Reuse
+from udata.tests.api import PytestOnlyDBTestCase
 
 from .helpers import mock_monthly_metrics_payload
 
 
-@pytest.mark.parametrize(
-    "target,value_keys",
-    [
-        ("dataset", ["visit", "download_resource"]),
-        ("dataservice", ["visit"]),
-        ("reuse", ["visit"]),
-        ("organization", ["visit_dataset", "download_resource", "visit_reuse"]),
-    ],
-)
-def test_get_metrics_for_model(app, rmock, target, value_keys):
-    mock_monthly_metrics_payload(
-        app, rmock, target, data=[(value_key, 2403) for value_key in value_keys]
+@pytest.mark.options(METRICS_API="http://metrics-api.fr/api")
+class GetStockMetricsTest(PytestOnlyDBTestCase):
+    @pytest.mark.parametrize(
+        "target,value_keys",
+        [
+            ("dataset", ["visit", "download_resource"]),
+            ("dataservice", ["visit"]),
+            ("reuse", ["visit"]),
+            ("organization", ["visit_dataset", "download_resource", "visit_reuse"]),
+        ],
     )
-    res = get_metrics_for_model(target, "id", value_keys)
-    for i, key in enumerate(value_keys):
-        assert len(res[i]) == 13  # The current month as well as last year's are included
-        assert list(res[i].values())[-1] == len(key) * 2403 + 1
-        assert list(res[i].values())[-2] == len(key) * 2403
+    def test_get_metrics_for_model(self, app, rmock, target, value_keys):
+        mock_monthly_metrics_payload(
+            app, rmock, target, data=[(value_key, 2403) for value_key in value_keys]
+        )
+        res = get_metrics_for_model(target, "id", value_keys)
+        for i, key in enumerate(value_keys):
+            assert len(res[i]) == 13  # The current month as well as last year's are included
+            assert list(res[i].values())[-1] == len(key) * 2403 + 1
+            assert list(res[i].values())[-2] == len(key) * 2403
 
+    def test_get_metrics_for_site(self, app, rmock):
+        value_keys = [
+            "visit_dataset",
+            "download_resource",
+        ]
+        url = f"{app.config['METRICS_API']}/site/data/?metric_month__sort=desc"
+        mock_monthly_metrics_payload(
+            app, rmock, "site", data=[(value_key, 2403) for value_key in value_keys], url=url
+        )
+        res = get_metrics_for_model("site", None, value_keys)
+        for i, key in enumerate(value_keys):
+            assert len(res[i]) == 13  # The current month as well as last year's are included
+            assert list(res[i].values())[-1] == len(key) * 2403 + 1
+            assert list(res[i].values())[-2] == len(key) * 2403
 
-def test_get_metrics_for_site(app, rmock):
-    value_keys = [
-        "visit_dataset",
-        "download_resource",
-    ]
-    url = f"{app.config['METRICS_API']}/site/data/?metric_month__sort=desc"
-    mock_monthly_metrics_payload(
-        app, rmock, "site", data=[(value_key, 2403) for value_key in value_keys], url=url
+    @pytest.mark.parametrize(
+        "model,factory,date_label",
+        [
+            (Dataset, DatasetFactory, "created_at_internal"),
+            (Dataservice, DataserviceFactory, "created_at"),
+            (Reuse, ReuseFactory, "created_at"),
+            (Organization, OrganizationFactory, "created_at"),
+        ],
     )
-    res = get_metrics_for_model("site", None, value_keys)
-    for i, key in enumerate(value_keys):
-        assert len(res[i]) == 13  # The current month as well as last year's are included
-        assert list(res[i].values())[-1] == len(key) * 2403 + 1
-        assert list(res[i].values())[-2] == len(key) * 2403
-
-
-@pytest.mark.parametrize(
-    "model,factory,date_label",
-    [
-        (Dataset, DatasetFactory, "created_at_internal"),
-        (Dataservice, DataserviceFactory, "created_at"),
-        (Reuse, ReuseFactory, "created_at"),
-        (Organization, OrganizationFactory, "created_at"),
-    ],
-)
-def test_get_stock_metrics(app, clean_db, model, factory, date_label):
-    [factory() for i in range(10)]
-    [factory(**{date_label: datetime.now().replace(day=1) - timedelta(days=1)}) for i in range(8)]
-    res = get_stock_metrics(model.objects(), date_label)
-    assert list(res.values())[-1] == 10
-    assert list(res.values())[-2] == 8
-    assert list(res.values())[-3] == 0
+    def test_get_stock_metrics(self, model, factory, date_label):
+        [factory() for i in range(10)]
+        [
+            factory(**{date_label: datetime.now().replace(day=1) - timedelta(days=1)})
+            for i in range(8)
+        ]
+        res = get_stock_metrics(model.objects(), date_label)
+        assert list(res.values())[-1] == 10
+        assert list(res.values())[-2] == 8
+        assert list(res.values())[-3] == 0