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

udata/tests/api/test_contact_points.py

@@ -1,4 +1,3 @@
-import pytest
 from flask import url_for
 
 from udata.core.contact_point.factories import ContactPointFactory
@@ -7,17 +6,12 @@ from udata.core.organization.factories import OrganizationFactory
 from udata.core.organization.models import Member
 from udata.i18n import gettext as _
 from udata.models import ContactPoint
+from udata.tests.api import APITestCase
 from udata.tests.helpers import assert200, assert201, assert204, assert400, assert403
 from udata.utils import faker
 
-pytestmark = [
-    pytest.mark.usefixtures("clean_db"),
-]
-
-
-class ContactPointAPITest:
-    modules = []
 
+class ContactPointAPITest(APITestCase):
     def test_get_or_create(self):
         org = OrganizationFactory()
         contact_point, created = ContactPoint.objects().get_or_create(
@@ -51,46 +45,46 @@ class ContactPointAPITest:
         assert created
         assert contact_point.name == "Another"
 
-    def test_contact_point_api_create(self, api):
-        user = api.login()
+    def test_contact_point_api_create(self):
+        user = self.login()
         data = {
             "name": faker.word(),
             "email": faker.email(),
             "contact_form": faker.url(),
             "role": "contact",
         }
-        response = api.post(url_for("api.contact_points"), data=data)
+        response = self.post(url_for("api.contact_points"), data=data)
         assert201(response)
         assert ContactPoint.objects.count() == 1
 
         contact_point = ContactPoint.objects.first()
         assert contact_point.owner.id == user.id
 
-    def test_contact_point_api_create_email_or_contact_form(self, api):
-        api.login()
+    def test_contact_point_api_create_email_or_contact_form(self):
+        self.login()
         data = {"name": faker.word(), "contact_form": faker.url(), "role": "contact"}
-        response = api.post(url_for("api.contact_points"), data=data)
+        response = self.post(url_for("api.contact_points"), data=data)
         assert201(response)
         assert ContactPoint.objects.count() == 1
 
         data = {"name": faker.word(), "email": faker.email(), "role": "contact"}
-        response = api.post(url_for("api.contact_points"), data=data)
+        response = self.post(url_for("api.contact_points"), data=data)
         assert201(response)
         assert ContactPoint.objects.count() == 2
 
-    def test_contact_point_duplicate_creation(self, api):
-        api.login()
+    def test_contact_point_duplicate_creation(self):
+        self.login()
         data = {"name": faker.word(), "contact_form": faker.url(), "role": "contact"}
-        response = api.post(url_for("api.contact_points"), data=data)
+        response = self.post(url_for("api.contact_points"), data=data)
         assert201(response)
         assert ContactPoint.objects.count() == 1
 
-        response = api.post(url_for("api.contact_points"), data=data)
+        response = self.post(url_for("api.contact_points"), data=data)
         assert200(response)
         assert ContactPoint.objects.count() == 1
 
-    def test_contact_point_for_different_org(self, api):
-        user = api.login()
+    def test_contact_point_for_different_org(self):
+        user = self.login()
         member = Member(user=user, role="editor")
         org_a = OrganizationFactory(members=[member])
 
@@ -100,11 +94,11 @@ class ContactPointAPITest:
             "role": "contact",
             "organization": str(org_a.id),
         }
-        response = api.post(url_for("api.contact_points"), data=data)
+        response = self.post(url_for("api.contact_points"), data=data)
         assert201(response)
         assert ContactPoint.objects.count() == 1
 
-        response = api.post(url_for("api.contact_points"), data=data)
+        response = self.post(url_for("api.contact_points"), data=data)
         assert200(response)
         assert ContactPoint.objects.count() == 1
 
@@ -114,39 +108,39 @@ class ContactPointAPITest:
 
         org_b = OrganizationFactory(members=[])
         data["organization"] = str(org_b.id)
-        response = api.post(url_for("api.contact_points"), data=data)
+        response = self.post(url_for("api.contact_points"), data=data)
         assert400(response)
         assert ContactPoint.objects.count() == 1
 
         org_b.members = [Member(user=user, role="editor")]
         org_b.save()
 
-        response = api.post(url_for("api.contact_points"), data=data)
+        response = self.post(url_for("api.contact_points"), data=data)
         assert201(response)
         assert ContactPoint.objects.count() == 2
 
-    def test_contact_point_api_invalid_email(self, api):
-        api.login()
+    def test_contact_point_api_invalid_email(self):
+        self.login()
         data = {"name": faker.word(), "email": faker.word(), "role": "contact"}
-        response = api.post(url_for("api.contact_points"), data=data)
+        response = self.post(url_for("api.contact_points"), data=data)
         assert400(response)
         assert "email" in response.json["errors"]
         assert ContactPoint.objects.count() == 0
 
-    def test_contact_point_missing_contact_information(self, api):
-        api.login()
+    def test_contact_point_missing_contact_information(self):
+        self.login()
         data = {"name": faker.word(), "role": "contact"}
-        response = api.post(url_for("api.contact_points"), data=data)
+        response = self.post(url_for("api.contact_points"), data=data)
         assert400(response)
         assert response.json["message"] == _(
             "At least an email or a contact form is required for a contact point"
         )
         assert ContactPoint.objects.count() == 0
 
-    def test_contact_point_missing_role(self, api):
-        api.login()
+    def test_contact_point_missing_role(self):
+        self.login()
         data = {"name": faker.word(), "email": faker.email()}
-        response = api.post(url_for("api.contact_points"), data=data)
+        response = self.post(url_for("api.contact_points"), data=data)
         assert400(response)
         assert (
             response.json["message"]
@@ -154,70 +148,70 @@ class ContactPointAPITest:
         )
         assert ContactPoint.objects.count() == 0
 
-    def test_contact_point_no_need_for_email_for_role_other_than_contact(self, api):
-        api.login()
+    def test_contact_point_no_need_for_email_for_role_other_than_contact(self):
+        self.login()
         roles_other_than_contact = [role_ for role_ in CONTACT_ROLES.keys() if role_ != "contact"]
         for index, role in enumerate(roles_other_than_contact):
             data = {"name": faker.word(), "role": role}
-            response = api.post(url_for("api.contact_points"), data=data)
+            response = self.post(url_for("api.contact_points"), data=data)
             assert201(response)
             assert ContactPoint.objects.count() == index + 1
 
-    def test_contact_point_api_update(self, api):
-        user = api.login()
+    def test_contact_point_api_update(self):
+        user = self.login()
         member = Member(user=user, role="editor")
         org = OrganizationFactory(members=[member])
         contact_point = ContactPointFactory(organization=org)
         data = contact_point.to_dict()
         data["email"] = "new.email@newdomain.com"
-        response = api.put(url_for("api.contact_point", contact_point=contact_point), data)
+        response = self.put(url_for("api.contact_point", contact_point=contact_point), data)
         assert200(response)
         assert ContactPoint.objects.count() == 1
         assert ContactPoint.objects.first().email == "new.email@newdomain.com"
 
-    def test_contact_point_api_update_to_existing_contact_point(self, api):
-        user = api.login()
+    def test_contact_point_api_update_to_existing_contact_point(self):
+        user = self.login()
         contact_point_a = ContactPointFactory(email="a@example.org", owner=user)
         contact_point_b = ContactPointFactory(email="b@example.org", owner=user)
 
         data_b = contact_point_b.to_dict()
-        response = api.put(url_for("api.contact_point", contact_point=contact_point_a), data_b)
+        response = self.put(url_for("api.contact_point", contact_point=contact_point_a), data_b)
         assert400(response)
         assert ContactPoint.objects.count() == 2
 
         contact_point_a.reload()
         assert contact_point_a.email == "a@example.org"
 
-    def test_contact_point_api_update_forbidden(self, api):
-        api.login()
+    def test_contact_point_api_update_forbidden(self):
+        self.login()
         org = OrganizationFactory()
         contact_point = ContactPointFactory(organization=org)
         data = contact_point.to_dict()
         data["email"] = "new.email@newdomain.com"
-        response = api.put(url_for("api.contact_point", contact_point=contact_point), data)
+        response = self.put(url_for("api.contact_point", contact_point=contact_point), data)
         assert403(response)
         assert ContactPoint.objects.count() == 1
         assert ContactPoint.objects.first().email == contact_point.email
 
-    def test_contact_point_api_delete(self, api):
-        user = api.login()
+    def test_contact_point_api_delete(self):
+        user = self.login()
         member = Member(user=user, role="editor")
         org = OrganizationFactory(members=[member])
         contact_point = ContactPointFactory(organization=org)
-        response = api.delete(url_for("api.contact_point", contact_point=contact_point))
+        response = self.delete(url_for("api.contact_point", contact_point=contact_point))
         assert204(response)
         assert ContactPoint.objects.count() == 0
 
-    def test_contact_point_roles_list(self, api):
+    def test_contact_point_roles_list(self):
         """It should fetch the contact point roles list from the API"""
-        response = api.get(url_for("api.contact_point_roles"))
+        response = self.get(url_for("api.contact_point_roles"))
         assert200(response)
         assert len(response.json) == len(CONTACT_ROLES)
 
-    def test_contact_point_api_delete_forbidden(self, api):
-        api.login()
+    def test_contact_point_api_delete_forbidden(self):
+        self.login()
         org = OrganizationFactory()
         contact_point = ContactPointFactory(organization=org)
-        response = api.delete(url_for("api.contact_point", contact_point=contact_point))
+        response = self.delete(url_for("api.contact_point", contact_point=contact_point))
         assert403(response)
         assert ContactPoint.objects.count() == 1

udata/tests/api/test_dataservices_api.py

@@ -34,8 +34,6 @@ def dataservice_in_response(response: TestResponse, dataservice: Dataservice) ->
 
 
 class DataserviceAPITest(APITestCase):
-    modules = []
-
     def test_dataservice_api_get(self):
         """It should fetch a dataservice from the API"""
         dataservice = DataserviceFactory()

udata/tests/api/test_datasets_api.py

@@ -42,12 +42,12 @@ from udata.core.topic.factories import TopicElementDatasetFactory, TopicFactory
 from udata.core.user.factories import AdminFactory, UserFactory
 from udata.i18n import gettext as _
 from udata.models import CommunityResource, Dataset, Follow, Member, db
-from udata.tags import MAX_TAG_LENGTH, MIN_TAG_LENGTH
+from udata.tags import TAG_MAX_LENGTH, TAG_MIN_LENGTH
 from udata.tests.features.territories import create_geozones_fixtures
 from udata.tests.helpers import assert200, assert404
 from udata.utils import faker, unique_string
 
-from . import APITestCase
+from . import APITestCase, PytestOnlyAPITestCase
 
 SAMPLE_GEOM = {
     "type": "MultiPolygon",
@@ -67,8 +67,6 @@ def dataset_in_response(response: TestResponse, dataset: Dataset) -> bool:
 
 
 class DatasetAPITest(APITestCase):
-    modules = []
-
     def test_dataset_api_list(self):
         """It should fetch a dataset list from the API"""
         datasets = [DatasetFactory() for i in range(2)]
@@ -632,19 +630,21 @@ class DatasetAPITest(APITestCase):
         dataset = Dataset.objects.first()
         self.assertEqual(dataset.tags, sorted(data["tags"]))
 
+    @pytest.mark.options(TAG_MIN_LENGTH=3, TAG_MAX_LENGTH=10)
     def test_dataset_api_fail_to_create_too_short_tags(self):
         """It should fail to create a dataset from the API because
         the tag is too short"""
         data = DatasetFactory.as_dict()
-        data["tags"] = [unique_string(MIN_TAG_LENGTH - 1)]
+        data["tags"] = [unique_string(TAG_MIN_LENGTH - 1)]
         with self.api_user():
             response = self.post(url_for("api.datasets"), data)
         self.assertStatus(response, 400)
 
+    @pytest.mark.options(TAG_MIN_LENGTH=3, TAG_MAX_LENGTH=10)
     def test_dataset_api_fail_to_create_too_long_tags(self):
         """Should fail creating a dataset with a tag long"""
         data = DatasetFactory.as_dict()
-        data["tags"] = [unique_string(MAX_TAG_LENGTH + 1)]
+        data["tags"] = [unique_string(TAG_MAX_LENGTH + 1)]
         with self.api_user():
             response = self.post(url_for("api.datasets"), data)
         self.assertStatus(response, 400)
@@ -1423,7 +1423,7 @@ class DatasetsFeedAPItest(APITestCase):
         assert "<h1>" in response.text
         assert "<ul>" in response.text
 
-    @pytest.mark.options(DELAY_BEFORE_APPEARING_IN_RSS_FEED=0)
+    @pytest.mark.options(DELAY_BEFORE_APPEARING_IN_RSS_FEED=0, CDATA_BASE_URL="http://example.org")
     def test_feed_id_uri_is_valid(self):
         DatasetFactory()
 
@@ -1503,8 +1503,6 @@ class DatasetBadgeAPITest(APITestCase):
 
 
 class DatasetResourceAPITest(APITestCase):
-    modules = None
-
     def setUp(self):
         self.login()
         self.dataset = DatasetFactory(owner=self.user)
@@ -1953,35 +1951,25 @@ class DatasetResourceAPITest(APITestCase):
         self.assertEqual(Follow.objects.following(user).count(), 0)
         self.assertEqual(Follow.objects.followers(user).count(), 0)
 
+    @pytest.mark.options(ALLOWED_RESOURCES_EXTENSIONS=["txt", "html", "kml", "kml-1", "qml", "xml"])
     def test_suggest_formats_api(self):
-        """It should suggest formats"""
-        DatasetFactory(
-            resources=[
-                ResourceFactory(format=f) for f in (faker.word(), faker.word(), "kml", "kml-1")
-            ]
-        )
-
-        response = self.get(url_for("api.suggest_formats"), qs={"q": "km", "size": "5"})
+        response = self.get(url_for("api.suggest_formats", q="km", size=5))
         self.assert200(response)
 
-        self.assertLessEqual(len(response.json), 5)
-        self.assertGreater(len(response.json), 1)
-
-        for suggestion in response.json:
-            self.assertIn("text", suggestion)
-            self.assertIn("km", suggestion["text"])
+        self.assertEqual(len(response.json), 2)
+        self.assertEqual(response.json[0]["text"], "kml")
+        self.assertEqual(response.json[1]["text"], "kml-1")
 
+    @pytest.mark.options(ALLOWED_RESOURCES_EXTENSIONS=["txt", "html", "kml", "kml-1", "qml", "xml"])
     def test_suggest_format_api_no_match(self):
-        """It should not provide format suggestion if no match"""
-        DatasetFactory(resources=[ResourceFactory(format=faker.word()) for _ in range(3)])
-
-        response = self.get(url_for("api.suggest_formats"), qs={"q": "test", "size": "5"})
+        response = self.get(url_for("api.suggest_formats", q="test", size=5))
         self.assert200(response)
         self.assertEqual(len(response.json), 0)
 
+    @pytest.mark.options(ALLOWED_RESOURCES_EXTENSIONS=[])
     def test_suggest_format_api_empty(self):
         """It should not provide format suggestion if no data"""
-        response = self.get(url_for("api.suggest_formats"), qs={"q": "test", "size": "5"})
+        response = self.get(url_for("api.suggest_formats", q="txt", size=5))
         self.assert200(response)
         self.assertEqual(len(response.json), 0)
 
@@ -1999,7 +1987,7 @@ class DatasetResourceAPITest(APITestCase):
             ]
         )
 
-        response = self.get(url_for("api.suggest_mime"), qs={"q": "js", "size": "5"})
+        response = self.get(url_for("api.suggest_mime", q="js", size=5))
         self.assert200(response)
         self.assertLessEqual(len(response.json), 5)
 
@@ -2010,7 +1998,7 @@ class DatasetResourceAPITest(APITestCase):
         """It should suggest mime types"""
         DatasetFactory(resources=[ResourceFactory(mime="application/xhtml+xml")])
 
-        response = self.get(url_for("api.suggest_mime"), qs={"q": "xml", "size": "5"})
+        response = self.get(url_for("api.suggest_mime", q="xml", size=5))
         self.assert200(response)
 
         self.assertEqual(len(response.json), 5)
@@ -2019,13 +2007,13 @@ class DatasetResourceAPITest(APITestCase):
         """It should not provide format suggestion if no match"""
         DatasetFactory(resources=[ResourceFactory(mime=faker.word()) for _ in range(3)])
 
-        response = self.get(url_for("api.suggest_mime"), qs={"q": "test", "size": "5"})
+        response = self.get(url_for("api.suggest_mime", q="test", size=5))
         self.assert200(response)
         self.assertEqual(len(response.json), 0)
 
     def test_suggest_mime_api_empty(self):
         """It should not provide mime suggestion if no data"""
-        response = self.get(url_for("api.suggest_mime"), qs={"q": "test", "size": "5"})
+        response = self.get(url_for("api.suggest_mime", q="test", size=5))
         self.assert200(response)
         self.assertEqual(len(response.json), 0)
 
@@ -2041,7 +2029,7 @@ class DatasetResourceAPITest(APITestCase):
             title="title-test-4", visible=True, metrics={"followers": 10}
         )
 
-        response = self.get(url_for("api.suggest_datasets"), qs={"q": "title-test", "size": "5"})
+        response = self.get(url_for("api.suggest_datasets", q="title-test", size=5))
         self.assert200(response)
 
         self.assertLessEqual(len(response.json), 5)
@@ -2064,7 +2052,7 @@ class DatasetResourceAPITest(APITestCase):
                 visible=True,
             )
 
-        response = self.get(url_for("api.suggest_datasets"), qs={"q": "acronym-test", "size": "5"})
+        response = self.get(url_for("api.suggest_datasets", q="acronym-test", size=5))
         self.assert200(response)
 
         self.assertLessEqual(len(response.json), 5)
@@ -2086,7 +2074,7 @@ class DatasetResourceAPITest(APITestCase):
                 resources=[ResourceFactory()],
             )
 
-        response = self.get(url_for("api.suggest_datasets"), qs={"q": "title-testé", "size": "5"})
+        response = self.get(url_for("api.suggest_datasets", q="title-testé", size=5))
         self.assert200(response)
 
         self.assertLessEqual(len(response.json), 5)
@@ -2104,13 +2092,13 @@ class DatasetResourceAPITest(APITestCase):
         for i in range(3):
             DatasetFactory(resources=[ResourceFactory()])
 
-        response = self.get(url_for("api.suggest_datasets"), qs={"q": "xxxxxx", "size": "5"})
+        response = self.get(url_for("api.suggest_datasets", q="xxxxxx", size=5))
         self.assert200(response)
         self.assertEqual(len(response.json), 0)
 
     def test_suggest_datasets_api_empty(self):
         """It should not provide dataset suggestion if no data"""
-        response = self.get(url_for("api.suggest_datasets"), qs={"q": "xxxxxx", "size": "5"})
+        response = self.get(url_for("api.suggest_datasets", q="xxxxxx", size=5))
         self.assert200(response)
         self.assertEqual(len(response.json), 0)
 
@@ -2140,8 +2128,6 @@ class DatasetReferencesAPITest(APITestCase):
 
 
 class DatasetArchivedAPITest(APITestCase):
-    modules = []
-
     def test_dataset_api_search_archived(self):
         """It should search datasets from the API, excluding archived ones"""
         DatasetFactory(archived=None)
@@ -2160,8 +2146,6 @@ class DatasetArchivedAPITest(APITestCase):
 
 
 class CommunityResourceAPITest(APITestCase):
-    modules = []
-
     def test_community_resource_api_get(self):
         """It should fetch a community resource from the API"""
         community_resource = CommunityResourceFactory()
@@ -2415,10 +2399,7 @@ class ResourcesTypesAPITest(APITestCase):
         self.assertEqual(len(response.json), len(RESOURCE_TYPES))
 
 
-@pytest.mark.usefixtures("clean_db")
-class DatasetSchemasAPITest:
-    modules = []
-
+class DatasetSchemasAPITest(PytestOnlyAPITestCase):
     def test_dataset_schemas_api_list(self, api, rmock, app):
         # Can't use @pytest.mark.options otherwise a request will be
         # made before setting up rmock at module load, resulting in a 404
@@ -2479,10 +2460,7 @@ class DatasetSchemasAPITest:
         )
 
 
-@pytest.mark.usefixtures("clean_db")
-class HarvestMetadataAPITest:
-    modules = []
-
+class HarvestMetadataAPITest(PytestOnlyAPITestCase):
     def test_dataset_with_harvest_metadata(self, api):
         date = datetime(2022, 2, 22, tzinfo=pytz.UTC)
         harvest_metadata = HarvestDatasetMetadata(

udata/tests/api/test_me_api.py

@@ -18,8 +18,6 @@ from . import APITestCase
 
 
 class MeAPITest(APITestCase):
-    modules = []
-
     def test_get_profile(self):
         """It should fetch my user data on GET"""
         self.login()
@@ -105,7 +103,7 @@ class MeAPITest(APITestCase):
         DatasetFactory(owner=user)
         DatasetFactory(organization=organization)
 
-        response = self.get(url_for("api.my_org_datasets"), qs={"q": "foô"})
+        response = self.get(url_for("api.my_org_datasets", q="foô"))
         self.assert200(response)
         self.assertEqual(len(response.json), len(datasets) + len(org_datasets))
 
@@ -139,7 +137,7 @@ class MeAPITest(APITestCase):
         CommunityResourceFactory(owner=user)
         CommunityResourceFactory(organization=organization)
 
-        response = self.get(url_for("api.my_org_community_resources"), qs={"q": "foô"})
+        response = self.get(url_for("api.my_org_community_resources", q="foô"))
         self.assert200(response)
         self.assertEqual(
             len(response.json), len(community_resources) + len(org_community_resources)
@@ -171,7 +169,7 @@ class MeAPITest(APITestCase):
         ReuseFactory(owner=user)
         ReuseFactory(organization=organization)
 
-        response = self.get(url_for("api.my_org_reuses"), qs={"q": "foô"})
+        response = self.get(url_for("api.my_org_reuses", q="foô"))
         self.assert200(response)
         self.assertEqual(len(response.json), len(reuses) + len(org_reuses))
 
@@ -221,7 +219,7 @@ class MeAPITest(APITestCase):
         Discussion.objects.create(subject=DatasetFactory(), title="foô", user=user)
         Discussion.objects.create(subject=ReuseFactory(), title="foô", user=user)
 
-        response = self.get(url_for("api.my_org_discussions"), qs={"q": "foô"})
+        response = self.get(url_for("api.my_org_discussions", q="foô"))
         self.assert200(response)
         self.assertEqual(len(response.json), len(discussions))