update null value tests to reflect string conversion 'none' -> None in enum_properties no longer works

Author: bckohan

django_enum/tests/tests.py

@@ -2104,24 +2104,40 @@ class TestSymmetricEmptyValEquivalency(TestCase):
 
         def test(self):
 
-            class EmptyEqEnum(TextChoices, s('prop', case_fold=True)):
+            # version 1.5.0 of enum_properties changed the default symmetricity
+            # of none values.
+            from enum_properties import VERSION
+            match_none = {} if VERSION < (1, 5, 0) else {'match_none': True}
+
+            class EmptyEqEnum(EnumProperties, s('label', case_fold=True)):
 
-                A = 'A', 'ok'
-                B = 'B', 'none'
+                A = 'A', 'A Label'
+                B = None, 'B Label'
 
             try:
                 form_field = EnumChoiceField(enum=EmptyEqEnum)
-                self.assertTrue(None not in form_field.empty_values)
-            except Exception:  # pragma: no cover
+            except Exception as err:  # pragma: no cover
                 self.fail(
                     "EnumChoiceField() raised value error with alternative"
                     "empty_value set."
                 )
 
-            # version 1.5.0 of enum_properties changed the default symmetricity
-            # of none values.
-            from enum_properties import VERSION
-            match_none = {} if VERSION < (1, 5, 0) else {'match_none': True}
+            self.assertTrue(None not in form_field.empty_values)
+
+            class EmptyEqEnum(EnumProperties, s('label', case_fold=True), s('prop', match_none=True)):
+
+                A = 'A', 'A Label', 4
+                B = 'B', 'B Label', None
+
+            try:
+                form_field = EnumChoiceField(enum=EmptyEqEnum)
+            except Exception as err:  # pragma: no cover
+                self.fail(
+                    "EnumChoiceField() raised value error with alternative"
+                    "empty_value set."
+                )
+
+            self.assertTrue(None not in form_field.empty_values)
 
             class EmptyEqEnum2(
                 TextChoices,

pyproject.toml

@@ -68,6 +68,7 @@ importlib-metadata = [
     { version = "<5.0", markers = "python_version <= '3.7'" },
     { version = ">=5.0", markers = "python_version > '3.7'" },
 ]
+ipdb = "^0.13.13"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]