add django rest framework tests and admin

Author: bckohan

django_enum/tests/djenum/admin.py

@@ -0,0 +1,4 @@
+from django.contrib import admin
+from django_enum.tests.djenum.models import EnumTester
+
+admin.site.register(EnumTester)

django_enum/tests/djenum/urls.py

@@ -1,6 +1,7 @@
-from django.urls import path
+from django.urls import include, path
 from django_enum.tests.djenum.models import EnumTester
 from django_enum.tests.djenum.views import (
+    DRFView,
     EnumTesterCreateView,
     EnumTesterDeleteView,
     EnumTesterDetailView,
@@ -10,9 +11,14 @@
     EnumTesterListView,
     EnumTesterUpdateView,
 )
+from rest_framework import routers
 
 app_name = 'django_enum_tests_djenum'
 
+
+router = routers.DefaultRouter()
+router.register(r'enumtesters', DRFView)
+
 urlpatterns = [
     path('enum/<int:pk>', EnumTesterDetailView.as_view(), name='enum-detail'),
     path('enum/list/', EnumTesterListView.as_view(), name='enum-list'),
@@ -21,7 +27,8 @@
     path('enum/<int:pk>/', EnumTesterUpdateView.as_view(), name='enum-update'),
     path('enum/form/<int:pk>/', EnumTesterFormView.as_view(), name='enum-form-update'),
     path('enum/<int:pk>/delete/', EnumTesterDeleteView.as_view(), name='enum-delete'),
-    path('enum/form/<int:pk>/delete/', EnumTesterFormDeleteView.as_view(), name='enum-form-delete')
+    path('enum/form/<int:pk>/delete/', EnumTesterFormDeleteView.as_view(), name='enum-form-delete'),
+    path('drf/', include(router.urls))
 ]
 
 try:

django_enum/tests/djenum/views.py

@@ -4,6 +4,7 @@
 from django_enum.tests.djenum import enums as dj_enums
 from django_enum.tests.djenum.forms import EnumTesterForm
 from django_enum.tests.djenum.models import EnumTester
+from rest_framework import serializers, viewsets
 
 
 class URLMixin:
@@ -96,6 +97,17 @@ def get_success_url(self):  # pragma: no cover
         return reverse(f'{self.NAMESPACE}:enum-list')
 
 
+class EnumTesterSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = EnumTester
+        fields = '__all__'
+
+
+class DRFView(viewsets.ModelViewSet):
+    queryset = EnumTester.objects.all()
+    serializer_class = EnumTesterSerializer
+
+
 try:
     from django_enum.filters import FilterSet as EnumFilterSet
     from django_filters.views import FilterView

django_enum/tests/enum_prop/admin.py

@@ -0,0 +1,4 @@
+from django.contrib import admin
+from django_enum.tests.enum_prop.models import EnumTester
+
+admin.site.register(EnumTester)

django_enum/tests/enum_prop/urls.py

@@ -1,7 +1,8 @@
 try:
-    from django.urls import path
+    from django.urls import include, path
     from django_enum.tests.enum_prop.models import EnumTester
     from django_enum.tests.enum_prop.views import (
+        DRFView,
         EnumTesterCreateView,
         EnumTesterDeleteView,
         EnumTesterDetailView,
@@ -11,9 +12,13 @@
         EnumTesterListView,
         EnumTesterUpdateView,
     )
+    from rest_framework import routers
 
     app_name = 'django_enum_tests_enum_prop'
 
+    router = routers.DefaultRouter()
+    router.register(r'enumtesters', DRFView)
+
     urlpatterns = [
         path('enum/<int:pk>', EnumTesterDetailView.as_view(), name='enum-detail'),
         path('enum/list/', EnumTesterListView.as_view(), name='enum-list'),
@@ -22,7 +27,8 @@
         path('enum/<int:pk>/', EnumTesterUpdateView.as_view(), name='enum-update'),
         path('enum/form/<int:pk>/', EnumTesterFormView.as_view(), name='enum-form-update'),
         path('enum/<int:pk>/delete/', EnumTesterDeleteView.as_view(), name='enum-delete'),
-        path('enum/form/<int:pk>/delete/', EnumTesterFormDeleteView.as_view(), name='enum-form-delete')
+        path('enum/form/<int:pk>/delete/', EnumTesterFormDeleteView.as_view(), name='enum-form-delete'),
+        path('drf/', include(router.urls))
     ]
 
     try:

django_enum/tests/enum_prop/views.py

@@ -5,6 +5,7 @@
     from django_enum.tests.enum_prop import enums as prop_enums
     from django_enum.tests.enum_prop.forms import EnumTesterForm
     from django_enum.tests.enum_prop.models import EnumTester
+    from rest_framework import serializers, viewsets
 
 
     class EnumTesterDetailView(views.EnumTesterDetailView):
@@ -64,6 +65,18 @@ class EnumTesterFormDeleteView(views.EnumTesterFormDeleteView):
         NAMESPACE = 'django_enum_tests_enum_prop'
         enums = prop_enums
 
+
+    class EnumTesterSerializer(serializers.ModelSerializer):
+        class Meta:
+            model = EnumTester
+            fields = '__all__'
+
+
+    class DRFView(viewsets.ModelViewSet):
+        queryset = EnumTester.objects.all()
+        serializer_class = EnumTesterSerializer
+
+
     try:
 
         from django_enum.tests.djenum.views import EnumTesterFilterViewSet

django_enum/tests/settings.py

@@ -44,6 +44,7 @@
 INSTALLED_APPS = [
     'django_enum.tests.djenum',
     'django_enum.tests.tmpls',
+    'rest_framework',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -74,3 +75,9 @@
 
 TEST_EDIT_DIR = Path(__file__).parent / 'edit_tests' / 'edits'
 TEST_MIGRATION_DIR = Path(__file__).parent / 'edit_tests' / 'migrations'
+
+REST_FRAMEWORK = {
+    # no auth
+    'DEFAULT_AUTHENTICATION_CLASSES': [],
+    'DEFAULT_PERMISSION_CLASSES': [],
+}

django_enum/tests/tests.py

@@ -779,6 +779,22 @@ class TestRequests(EnumTypeMixin, TestCase):
 
     maxDiff = None
 
+    fields = [
+        'small_pos_int',
+        'small_int',
+        'pos_int',
+        'int',
+        'big_pos_int',
+        'big_int',
+        'constant',
+        'text',
+        'dj_int_enum',
+        'dj_text_enum',
+        'non_strict_int',
+        'non_strict_text',
+        'no_coerce',
+    ]
+
     def setUp(self):
         self.values = {val: {} for val in self.compared_attributes}
         self.objects = []
@@ -873,6 +889,65 @@ def post_params_symmetric(self):
             **self.post_params,
         }
 
+    def test_drf_read(self):
+        c = Client()
+        response = c.get(reverse(f'{self.NAMESPACE}:enumtester-list'))
+        read_objects = response.json()
+        self.assertEqual(len(read_objects), len(self.objects))
+
+        for idx, obj in enumerate(response.json()):
+            # should be same order
+            self.assertEqual(obj['id'], self.objects[idx].id)
+            for field in self.fields:
+                self.assertEqual(obj[field], getattr(self.objects[idx], field))
+
+    def test_drf_update(self):
+        c = Client()
+        params = self.post_params#_symmetric TODO
+        response = c.put(
+            reverse(
+                f'{self.NAMESPACE}:enumtester-detail',
+                kwargs={'pk': self.objects[0].id}
+            ),
+            params,
+            follow=True,
+            content_type='application/json'
+        )
+        self.assertEqual(response.status_code, 200)
+        fetched = c.get(
+            reverse(
+                f'{self.NAMESPACE}:enumtester-detail',
+                kwargs={'pk': self.objects[0].id}
+            ),
+            follow=True
+        ).json()
+
+        obj = self.MODEL_CLASS.objects.get(pk=self.objects[0].id)
+
+        self.assertEqual(fetched['id'], obj.id)
+        for field in self.fields:
+            self.assertEqual(fetched[field], getattr(obj, field))
+            self.assertEqual(params[field], getattr(obj, field))
+
+    def test_drf_post(self):
+        c = Client()
+        params = self.post_params#_symmetric TODO
+        response = c.post(
+            reverse(f'{self.NAMESPACE}:enumtester-list'),
+            params,
+            follow=True,
+            content_type='application/json'
+        )
+        self.assertEqual(response.status_code, 201)
+        created = response.json()
+
+        obj = self.MODEL_CLASS.objects.last()
+
+        self.assertEqual(created['id'], obj.id)
+        for field in self.fields:
+            self.assertEqual(created[field], getattr(obj, field))
+            self.assertEqual(params[field], getattr(obj, field))
+
     def test_add(self):
         """
         Test that add forms work and that EnumField type allows creations
@@ -959,21 +1034,7 @@ def test_add_form(self):
             response = c.get(reverse(f'{self.NAMESPACE}:{form_url}'))
             soup = Soup(response.content, features='html.parser')
 
-            for field in [
-                'small_pos_int',
-                'small_int',
-                'pos_int',
-                'int',
-                'big_pos_int',
-                'big_int',
-                'constant',
-                'text',
-                'dj_int_enum',
-                'dj_text_enum',
-                'non_strict_int',
-                'non_strict_text',
-                'no_coerce'
-            ]:
+            for field in self.fields:
                 field = EnumTester._meta.get_field(field)
                 expected = dict(zip([en for en in field.enum], field.enum.labels))  # value -> label
                 null_opt = False
@@ -1006,21 +1067,7 @@ def verify_form(self, obj, soup, non_strict_options=False):
             in the options lists for non strict fields
         :return:
         """
-        for field in [
-            'small_pos_int',
-            'small_int',
-            'pos_int',
-            'int',
-            'big_pos_int',
-            'big_int',
-            'constant',
-            'text',
-            'dj_int_enum',
-            'dj_text_enum',
-            'non_strict_int',
-            'non_strict_text',
-            'no_coerce',
-        ]:
+        for field in self.fields:
             field = self.MODEL_CLASS._meta.get_field(field)
             expected = dict(zip([en for en in field.enum],
                                 field.enum.labels))  # value -> label

pyproject.toml

@@ -65,6 +65,7 @@ coverage = "^6.2"
 beautifulsoup4 = "^4.11.1"
 pytest-django = "^4.5.2"
 django-test-migrations = "^1.2.0"
+djangorestframework = "^3.13.1"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]