tests for #35

Author: bckohan

django_enum/fields.py

@@ -94,7 +94,7 @@ def _coerce_to_value_type(self, value: Any) -> Enum:
             return type(values(self.enum)[0])(value)
         # can't ever reach this - just here to make type checker happy
         return value  # pragma: no cover
-
+    
     def __init__(
             self,
             *args,

django_enum/tests/djenum/admin.py

@@ -7,7 +7,7 @@
 class AdminDisplayBug35Admin(admin.ModelAdmin):
 
     list_display = ('text_enum', 'int_enum')
-    readonly_fields = ('text_enum', 'int_enum')
+    readonly_fields = ('text_enum', 'int_enum', 'blank_int', 'blank_txt')
 
 
 admin.site.register(AdminDisplayBug35, AdminDisplayBug35Admin)

django_enum/tests/djenum/migrations/0001_initial.py

@@ -1,7 +1,7 @@
-# Generated by Django 3.2.18 on 2023-04-09 00:14
+# Generated by Django 3.2.21 on 2023-10-01 01:48
 
-import django_enum.fields
 from django.db import migrations, models
+import django_enum.fields
 
 
 class Migration(migrations.Migration):
@@ -16,8 +16,10 @@ class Migration(migrations.Migration):
             name='AdminDisplayBug35',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('text_enum', django_enum.fields.EnumCharField(choices=[('A', 'Label A'), ('B', 'Label B'), ('C', 'Label C')], default=None, max_length=1, null=True)),
-                ('int_enum', django_enum.fields.EnumPositiveSmallIntegerField(choices=[(1, 'One'), (2, 'Two'), (3, 'Three')], default=None, null=True)),
+                ('text_enum', django_enum.fields.EnumCharField(choices=[('V1', 'Value1'), ('V22', 'Value2'), ('V333', 'Value3'), ('D', 'Default')], default='V1', max_length=4)),
+                ('int_enum', django_enum.fields.EnumPositiveSmallIntegerField(choices=[(0, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], default=2)),
+                ('blank_int', django_enum.fields.EnumPositiveSmallIntegerField(choices=[(0, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], default=None, null=True)),
+                ('blank_txt', django_enum.fields.EnumCharField(choices=[('V1', 'Value1'), ('V22', 'Value2'), ('V333', 'Value3'), ('D', 'Default')], default=None, max_length=4, null=True)),
             ],
         ),
         migrations.CreateModel(

django_enum/tests/djenum/models.py

@@ -119,14 +119,23 @@ class BadDefault(models.Model):
 class AdminDisplayBug35(models.Model):
 
     text_enum = EnumField(
-        DJTextEnum,
-        null=True,
-        default=None
+        TextEnum,
+        default=TextEnum.VALUE1
     )
 
     int_enum = EnumField(
-        DJIntEnum,
+        SmallPosIntEnum,
+        default=SmallPosIntEnum.VAL2
+    )
+
+    blank_int = EnumField(
+        SmallPosIntEnum,
         null=True,
         default=None
     )
 
+    blank_txt = EnumField(
+        TextEnum,
+        null=True,
+        default=None
+    )

django_enum/tests/enum_prop/admin.py

@@ -1,4 +1,12 @@
 from django.contrib import admin
-from django_enum.tests.enum_prop.models import EnumTester
+from django_enum.tests.enum_prop.models import EnumTester, AdminDisplayBug35
+
+
+class AdminDisplayBug35Admin(admin.ModelAdmin):
+
+    list_display = ('text_enum', 'int_enum')
+    readonly_fields = ('text_enum', 'int_enum', 'blank_int', 'blank_txt')
+
 
 admin.site.register(EnumTester)
+admin.site.register(AdminDisplayBug35, AdminDisplayBug35Admin)

django_enum/tests/enum_prop/migrations/0001_initial.py

@@ -1,7 +1,7 @@
-# Generated by Django 3.2.18 on 2023-04-02 18:42
+# Generated by Django 3.2.21 on 2023-10-01 01:48
 
-import django_enum.fields
 from django.db import migrations, models
+import django_enum.fields
 
 
 class Migration(migrations.Migration):
@@ -12,6 +12,16 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='AdminDisplayBug35',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('text_enum', django_enum.fields.EnumCharField(choices=[('V1', 'Value1'), ('V22', 'Value2'), ('V333', 'Value3'), ('D', 'Default')], default='V1', max_length=4)),
+                ('int_enum', django_enum.fields.EnumPositiveSmallIntegerField(choices=[(0, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], default=2)),
+                ('blank_int', django_enum.fields.EnumPositiveSmallIntegerField(choices=[(0, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], default=None, null=True)),
+                ('blank_txt', django_enum.fields.EnumCharField(choices=[('V1', 'Value1'), ('V22', 'Value2'), ('V333', 'Value3'), ('D', 'Default')], default=None, max_length=4, null=True)),
+            ],
+        ),
         migrations.CreateModel(
             name='EnumTester',
             fields=[

django_enum/tests/enum_prop/models.py

@@ -131,6 +131,31 @@ class Color(TextChoices, s('rgb'), s('hex', case_fold=True)):
         color = EnumField(Color)
 
 
+    class AdminDisplayBug35(models.Model):
+
+        text_enum = EnumField(
+            TextEnum,
+            default=TextEnum.VALUE1
+        )
+
+        int_enum = EnumField(
+            SmallPosIntEnum,
+            default=SmallPosIntEnum.VAL2
+        )
+
+        blank_int = EnumField(
+            SmallPosIntEnum,
+            null=True,
+            default=None
+        )
+
+        blank_txt = EnumField(
+            TextEnum,
+            null=True,
+            default=None
+        )
+
+
     class PerfCompare(models.Model):
 
         small_pos_int = models.PositiveSmallIntegerField(choices=SmallPosIntEnum.choices, null=True, default=None, db_index=True, blank=True)

django_enum/tests/tests.py

@@ -10,7 +10,7 @@
 from django.db import connection, transaction
 from django.db.models import Q
 from django.http import QueryDict
-from django.test import Client, TestCase
+from django.test import Client, TestCase, LiveServerTestCase
 from django.urls import reverse
 from django.utils.functional import classproperty
 from django_enum import TextChoices
@@ -30,7 +30,7 @@
 #     ExternEnum
 # )
 from django_enum.tests.djenum.forms import EnumTesterForm
-from django_enum.tests.djenum.models import BadDefault, EnumTester
+from django_enum.tests.djenum.models import BadDefault, EnumTester, AdminDisplayBug35
 from django_test_migrations.constants import MIGRATION_TEST_MARKER
 from django_test_migrations.contrib.unittest_case import MigratorTestCase
 
@@ -964,6 +964,53 @@ def test_query(self):
         self.assertRaises(ValueError, self.MODEL_CLASS.objects.filter, big_pos_int=type('WrongType')())
 
 
+class TestAdmin(EnumTypeMixin, LiveServerTestCase):
+
+    BUG35_CLASS = AdminDisplayBug35
+
+    def test_admin_list_display_bug35(self):
+        from django.contrib.auth import get_user_model
+
+        get_user_model().objects.create_superuser(
+            username='admin',
+            email='[email protected]',
+            password='admin_password',
+        )
+        self.client.login(username='admin', password='admin_password')
+
+        obj = self.BUG35_CLASS.objects.create()
+
+        resp = self.client.get(
+            reverse(f'admin:{self.BUG35_CLASS._meta.label_lower.replace(".", "_")}_changelist')
+        )
+        self.assertContains(resp, '<td class="field-int_enum">Value 2</td>')
+        change_link = reverse(
+            f'admin:{self.BUG35_CLASS._meta.label_lower.replace(".", "_")}_change',
+            args=[obj.id]
+        )
+        self.assertContains(resp, f'<a href="{change_link}">Value1</a>')
+
+    def test_admin_change_display_bug35(self):
+        from django.contrib.auth import get_user_model
+
+        get_user_model().objects.create_superuser(
+            username='admin',
+            email='[email protected]',
+            password='admin_password',
+        )
+        self.client.login(username='admin', password='admin_password')
+
+        obj = self.BUG35_CLASS.objects.create()
+        resp = self.client.get(
+            reverse(
+                f'admin:{self.BUG35_CLASS._meta.label_lower.replace(".", "_")}_change',
+                args=[obj.id]
+            )
+        )
+        self.assertContains(resp, '<div class="readonly">Value1</div>')
+        self.assertContains(resp, '<div class="readonly">Value 2</div>')
+
+
 class TestFormField(EnumTypeMixin, TestCase):
 
     MODEL_CLASS = EnumTester
@@ -1788,6 +1835,7 @@ def test_bulk_update(self):
         SingleEnumPerf,
         SingleFieldPerf,
         SingleNoCoercePerf,
+        AdminDisplayBug35
     )
     from enum_properties import EnumProperties, s
 
@@ -2100,6 +2148,11 @@ def test_saving(self):
             self.assertEqual(tester.text, None)
 
 
+    class TestEnumPropAdmin(TestAdmin):
+
+        BUG35_CLASS = AdminDisplayBug35
+
+
     class TestSymmetricEmptyValEquivalency(TestCase):
 
         def test(self):