test(api): fix warnings by renaming fixtures
This commit is contained in:
parent
6b478cd9f0
commit
4cc7c86f04
|
@ -10,21 +10,21 @@ from funkwhale_api.federation import utils as federation_utils
|
||||||
from funkwhale_api.users import models
|
from funkwhale_api.users import models
|
||||||
|
|
||||||
|
|
||||||
class TestActionFilterSet(django_filters.FilterSet):
|
class FilterSetFixture(django_filters.FilterSet):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = models.User
|
model = models.User
|
||||||
fields = ["is_active"]
|
fields = ["is_active"]
|
||||||
|
|
||||||
|
|
||||||
class TestSerializer(serializers.ActionSerializer):
|
class SerializerFixture(serializers.ActionSerializer):
|
||||||
actions = [serializers.Action("test", allow_all=True)]
|
actions = [serializers.Action("test", allow_all=True)]
|
||||||
filterset_class = TestActionFilterSet
|
filterset_class = FilterSetFixture
|
||||||
|
|
||||||
def handle_test(self, objects):
|
def handle_test(self, objects):
|
||||||
return {"hello": "world"}
|
return {"hello": "world"}
|
||||||
|
|
||||||
|
|
||||||
class TestDangerousSerializer(serializers.ActionSerializer):
|
class DangerousSerializerFixture(serializers.ActionSerializer):
|
||||||
actions = [
|
actions = [
|
||||||
serializers.Action("test", allow_all=True),
|
serializers.Action("test", allow_all=True),
|
||||||
serializers.Action("test_dangerous"),
|
serializers.Action("test_dangerous"),
|
||||||
|
@ -37,13 +37,13 @@ class TestDangerousSerializer(serializers.ActionSerializer):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class TestDeleteOnlyInactiveSerializer(serializers.ActionSerializer):
|
class DeleteOnlyInactiveSerializerFixture(serializers.ActionSerializer):
|
||||||
actions = [
|
actions = [
|
||||||
serializers.Action(
|
serializers.Action(
|
||||||
"test", allow_all=True, qs_filter=lambda qs: qs.filter(is_active=False)
|
"test", allow_all=True, qs_filter=lambda qs: qs.filter(is_active=False)
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
filterset_class = TestActionFilterSet
|
filterset_class = FilterSetFixture
|
||||||
|
|
||||||
def handle_test(self, objects):
|
def handle_test(self, objects):
|
||||||
pass
|
pass
|
||||||
|
@ -51,7 +51,7 @@ class TestDeleteOnlyInactiveSerializer(serializers.ActionSerializer):
|
||||||
|
|
||||||
def test_action_serializer_validates_action():
|
def test_action_serializer_validates_action():
|
||||||
data = {"objects": "all", "action": "nope"}
|
data = {"objects": "all", "action": "nope"}
|
||||||
serializer = TestSerializer(data, queryset=models.User.objects.none())
|
serializer = SerializerFixture(data, queryset=models.User.objects.none())
|
||||||
|
|
||||||
assert serializer.is_valid() is False
|
assert serializer.is_valid() is False
|
||||||
assert "action" in serializer.errors
|
assert "action" in serializer.errors
|
||||||
|
@ -59,7 +59,7 @@ def test_action_serializer_validates_action():
|
||||||
|
|
||||||
def test_action_serializer_validates_objects():
|
def test_action_serializer_validates_objects():
|
||||||
data = {"objects": "nope", "action": "test"}
|
data = {"objects": "nope", "action": "test"}
|
||||||
serializer = TestSerializer(data, queryset=models.User.objects.none())
|
serializer = SerializerFixture(data, queryset=models.User.objects.none())
|
||||||
|
|
||||||
assert serializer.is_valid() is False
|
assert serializer.is_valid() is False
|
||||||
assert "objects" in serializer.errors
|
assert "objects" in serializer.errors
|
||||||
|
@ -70,7 +70,7 @@ def test_action_serializers_objects_clean_ids(factories):
|
||||||
factories["users.User"]()
|
factories["users.User"]()
|
||||||
|
|
||||||
data = {"objects": [user1.pk], "action": "test"}
|
data = {"objects": [user1.pk], "action": "test"}
|
||||||
serializer = TestSerializer(data, queryset=models.User.objects.all())
|
serializer = SerializerFixture(data, queryset=models.User.objects.all())
|
||||||
|
|
||||||
assert serializer.is_valid(raise_exception=True) is True
|
assert serializer.is_valid(raise_exception=True) is True
|
||||||
assert list(serializer.validated_data["objects"]) == [user1]
|
assert list(serializer.validated_data["objects"]) == [user1]
|
||||||
|
@ -81,19 +81,19 @@ def test_action_serializers_objects_clean_all(factories):
|
||||||
user2 = factories["users.User"]()
|
user2 = factories["users.User"]()
|
||||||
|
|
||||||
data = {"objects": "all", "action": "test"}
|
data = {"objects": "all", "action": "test"}
|
||||||
serializer = TestSerializer(data, queryset=models.User.objects.all())
|
serializer = SerializerFixture(data, queryset=models.User.objects.all())
|
||||||
|
|
||||||
assert serializer.is_valid(raise_exception=True) is True
|
assert serializer.is_valid(raise_exception=True) is True
|
||||||
assert list(serializer.validated_data["objects"]) == [user1, user2]
|
assert list(serializer.validated_data["objects"]) == [user1, user2]
|
||||||
|
|
||||||
|
|
||||||
def test_action_serializers_save(factories, mocker):
|
def test_action_serializers_save(factories, mocker):
|
||||||
handler = mocker.spy(TestSerializer, "handle_test")
|
handler = mocker.spy(SerializerFixture, "handle_test")
|
||||||
factories["users.User"]()
|
factories["users.User"]()
|
||||||
factories["users.User"]()
|
factories["users.User"]()
|
||||||
|
|
||||||
data = {"objects": "all", "action": "test"}
|
data = {"objects": "all", "action": "test"}
|
||||||
serializer = TestSerializer(data, queryset=models.User.objects.all())
|
serializer = SerializerFixture(data, queryset=models.User.objects.all())
|
||||||
|
|
||||||
assert serializer.is_valid(raise_exception=True) is True
|
assert serializer.is_valid(raise_exception=True) is True
|
||||||
result = serializer.save()
|
result = serializer.save()
|
||||||
|
@ -106,7 +106,7 @@ def test_action_serializers_filterset(factories):
|
||||||
user2 = factories["users.User"](is_active=True)
|
user2 = factories["users.User"](is_active=True)
|
||||||
|
|
||||||
data = {"objects": "all", "action": "test", "filters": {"is_active": True}}
|
data = {"objects": "all", "action": "test", "filters": {"is_active": True}}
|
||||||
serializer = TestSerializer(data, queryset=models.User.objects.all())
|
serializer = SerializerFixture(data, queryset=models.User.objects.all())
|
||||||
|
|
||||||
assert serializer.is_valid(raise_exception=True) is True
|
assert serializer.is_valid(raise_exception=True) is True
|
||||||
assert list(serializer.validated_data["objects"]) == [user2]
|
assert list(serializer.validated_data["objects"]) == [user2]
|
||||||
|
@ -114,7 +114,7 @@ def test_action_serializers_filterset(factories):
|
||||||
|
|
||||||
def test_action_serializers_validates_at_least_one_object():
|
def test_action_serializers_validates_at_least_one_object():
|
||||||
data = {"objects": "all", "action": "test"}
|
data = {"objects": "all", "action": "test"}
|
||||||
serializer = TestSerializer(data, queryset=models.User.objects.none())
|
serializer = SerializerFixture(data, queryset=models.User.objects.none())
|
||||||
|
|
||||||
assert serializer.is_valid() is False
|
assert serializer.is_valid() is False
|
||||||
assert "non_field_errors" in serializer.errors
|
assert "non_field_errors" in serializer.errors
|
||||||
|
@ -123,7 +123,7 @@ def test_action_serializers_validates_at_least_one_object():
|
||||||
def test_dangerous_actions_refuses_all(factories):
|
def test_dangerous_actions_refuses_all(factories):
|
||||||
factories["users.User"]()
|
factories["users.User"]()
|
||||||
data = {"objects": "all", "action": "test_dangerous"}
|
data = {"objects": "all", "action": "test_dangerous"}
|
||||||
serializer = TestDangerousSerializer(data, queryset=models.User.objects.all())
|
serializer = DangerousSerializerFixture(data, queryset=models.User.objects.all())
|
||||||
|
|
||||||
assert serializer.is_valid() is False
|
assert serializer.is_valid() is False
|
||||||
assert "non_field_errors" in serializer.errors
|
assert "non_field_errors" in serializer.errors
|
||||||
|
@ -134,7 +134,7 @@ def test_action_serializers_can_require_filter(factories):
|
||||||
factories["users.User"](is_active=True)
|
factories["users.User"](is_active=True)
|
||||||
|
|
||||||
data = {"objects": "all", "action": "test"}
|
data = {"objects": "all", "action": "test"}
|
||||||
serializer = TestDeleteOnlyInactiveSerializer(
|
serializer = DeleteOnlyInactiveSerializerFixture(
|
||||||
data, queryset=models.User.objects.all()
|
data, queryset=models.User.objects.all()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -335,7 +335,7 @@ def test_prepare_for_serializer_fallback():
|
||||||
|
|
||||||
|
|
||||||
def test_jsonld_serializer_fallback():
|
def test_jsonld_serializer_fallback():
|
||||||
class TestSerializer(jsonld.JsonLdSerializer):
|
class JsonLdSerializerFixture(jsonld.JsonLdSerializer):
|
||||||
id = serializers.URLField()
|
id = serializers.URLField()
|
||||||
type = serializers.CharField()
|
type = serializers.CharField()
|
||||||
name = serializers.CharField()
|
name = serializers.CharField()
|
||||||
|
@ -376,7 +376,7 @@ def test_jsonld_serializer_fallback():
|
||||||
"count": 42,
|
"count": 42,
|
||||||
}
|
}
|
||||||
|
|
||||||
serializer = TestSerializer(data=payload)
|
serializer = JsonLdSerializerFixture(data=payload)
|
||||||
assert serializer.is_valid(raise_exception=True)
|
assert serializer.is_valid(raise_exception=True)
|
||||||
|
|
||||||
assert serializer.validated_data == {
|
assert serializer.validated_data == {
|
||||||
|
@ -389,7 +389,7 @@ def test_jsonld_serializer_fallback():
|
||||||
|
|
||||||
|
|
||||||
def test_jsonld_serializer_dereference(a_responses):
|
def test_jsonld_serializer_dereference(a_responses):
|
||||||
class TestSerializer(jsonld.JsonLdSerializer):
|
class JsonLdSerializerFixture(jsonld.JsonLdSerializer):
|
||||||
id = serializers.URLField()
|
id = serializers.URLField()
|
||||||
type = serializers.CharField()
|
type = serializers.CharField()
|
||||||
followers = serializers.JSONField()
|
followers = serializers.JSONField()
|
||||||
|
@ -413,7 +413,7 @@ def test_jsonld_serializer_dereference(a_responses):
|
||||||
}
|
}
|
||||||
|
|
||||||
a_responses.get(followers_doc["id"], payload=followers_doc)
|
a_responses.get(followers_doc["id"], payload=followers_doc)
|
||||||
serializer = TestSerializer(data=payload)
|
serializer = JsonLdSerializerFixture(data=payload)
|
||||||
|
|
||||||
assert serializer.is_valid(raise_exception=True)
|
assert serializer.is_valid(raise_exception=True)
|
||||||
assert serializer.validated_data == {
|
assert serializer.validated_data == {
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Fix api tests warnings by renaming fixtures
|
Loading…
Reference in New Issue