Change unittests to have different expected schema depending on the version of pydantic

Author: Mark90

tests/unit_tests/helpers.py

@@ -1,3 +1,8 @@
+import pydantic.version
+
+PYDANTIC_VERSION = pydantic.version.version_short()
+
+
 def assert_equal_ignore_key(expected, actual, ignore_keys):
     def deep_remove_keys(d, keys_to_ignore):
         if isinstance(d, dict):

tests/unit_tests/test_choice_list.py

@@ -4,6 +4,8 @@
 from pydantic_forms.core import FormPage
 from pydantic_forms.validators import Choice, choice_list
 
+from tests.unit_tests.helpers import PYDANTIC_VERSION
+
 
 def test_choice_list():
     class LegChoice(Choice):
@@ -149,13 +151,17 @@ def test_choice_list_constraint_at_least_one_item(Form):
         Form(choice=[])
 
     errors = exc_info.value.errors(include_url=False, include_context=False)
+
+    if PYDANTIC_VERSION == "2.8":
+        message = "List should have at least 1 item after validation, not 0"
+    else:
+        message = "Value should have at least 1 item after validation, not 0"
     expected = [
         {
             "input": [],
             "loc": ("choice",),
-            "msg": "Value should have at least 1 item after validation, not 0",
+            "msg": message,
             "type": "too_short",
-            # "ctx": {"limit_value": 1},
         }
     ]
     assert errors == expected

tests/unit_tests/test_constrained_list.py

@@ -3,6 +3,9 @@
 
 from pydantic_forms.core import FormPage
 from pydantic_forms.validators import unique_conlist
+from pydantic.version import version_short as pydantic_version_short
+
+from tests.unit_tests.helpers import PYDANTIC_VERSION
 
 
 def test_constrained_list_good():
@@ -74,12 +77,15 @@ def test_constrained_list_too_short():
 
     errors = exc_info.value.errors(include_url=False, include_context=False)
 
+    if PYDANTIC_VERSION == "2.8":
+        message = "List should have at least 1 item after validation, not 0"
+    else:
+        message = "Value should have at least 1 item after validation, not 0"
     expected = [
         {
-            # "ctx": {"error": ListMinLengthError(limit_value=1)},
             "input": [],
             "loc": ("v",),
-            "msg": "Value should have at least 1 item after validation, not 0",
+            "msg": message,
             "type": "too_short",
         }
     ]
@@ -111,11 +117,15 @@ class UniqueConListModel(FormPage):
         UniqueConListModel(v=[])
 
     errors = exc_info.value.errors(include_url=False, include_context=False)
+    if PYDANTIC_VERSION == "2.8":
+        message = "List should have at least 1 item after validation, not 0"
+    else:
+        message = "Value should have at least 1 item after validation, not 0"
     assert errors == [
         {
             "input": [],
             "loc": ("v",),
-            "msg": "Value should have at least 1 item after validation, not 0",
+            "msg": message,
             "type": "too_short",
             # "ctx": {"limit_value": 1},
         }

tests/unit_tests/test_display_subscription.py

@@ -2,6 +2,7 @@
 
 from pydantic_forms.core import FormPage
 from pydantic_forms.validators import DisplaySubscription, Label, migration_summary
+from tests.unit_tests.helpers import PYDANTIC_VERSION
 
 
 def test_display_subscription():
@@ -35,6 +36,11 @@ class Form(FormPage):
         label: Label
         summary: Summary
 
+    if PYDANTIC_VERSION == "2.8":
+        summary_ref = {"allOf": [{"$ref": "#/$defs/MigrationSummaryValue"}]}
+    else:
+        summary_ref = {"$ref": "#/$defs/MigrationSummaryValue"}
+
     expected = {
         "$defs": {"MigrationSummaryValue": {"properties": {}, "title": "MigrationSummaryValue", "type": "object"}},
         "additionalProperties": False,
@@ -53,7 +59,7 @@ class Form(FormPage):
                 "type": "string",
             },
             "summary": {
-                "$ref": "#/$defs/MigrationSummaryValue",
+                **summary_ref,
                 "default": None,
                 "format": "summary",
                 "type": "string",

tests/unit_tests/test_list_of_two.py

@@ -3,6 +3,7 @@
 
 from pydantic_forms.core import FormPage
 from pydantic_forms.validators import ListOfTwo
+from tests.unit_tests.helpers import PYDANTIC_VERSION
 
 
 @pytest.fixture(name="Form")
@@ -22,11 +23,15 @@ def test_list_of_two_min_items(Form):
         assert Form(two=[1])
 
     errors = error_info.value.errors(include_url=False, include_context=False)
+    if PYDANTIC_VERSION == "2.8":
+        message = "List should have at least 2 items after validation, not 1"
+    else:
+        message = "Value should have at least 2 items after validation, not 1"
     expected = [
         {
             "input": [1],
             "loc": ("two",),
-            "msg": "Value should have at least 2 items after validation, not 1",
+            "msg": message,
             "type": "too_short",
         }
     ]
@@ -38,11 +43,15 @@ def test_list_of_two_max_items(Form):
         assert Form(two=[1, 2, 3])
 
     errors = error_info.value.errors(include_url=False, include_context=False)
+    if PYDANTIC_VERSION == "2.8":
+        message = "List should have at most 2 items after validation, not 3"
+    else:
+        message = "Value should have at most 2 items after validation, not 3"
     expected = [
         {
             "input": [1, 2, 3],
             "loc": ("two",),
-            "msg": "Value should have at most 2 items after validation, not 3",
+            "msg": message,
             "type": "too_long",
         },
     ]

tests/unit_tests/test_migration_summary.py

@@ -2,6 +2,7 @@
 
 from pydantic_forms.core import FormPage
 from pydantic_forms.validators import DisplaySubscription, Label, migration_summary
+from tests.unit_tests.helpers import PYDANTIC_VERSION
 
 
 def test_display_default():
@@ -33,12 +34,17 @@ def test_migration_summary_schema():
     class Form(FormPage):
         ms: Summary
 
+    if PYDANTIC_VERSION == "2.8":
+        ms_ref = {"allOf": [{"$ref": "#/$defs/MigrationSummaryValue"}]}
+    else:
+        ms_ref = {"$ref": "#/$defs/MigrationSummaryValue"}
+
     expected = {
         "$defs": {"MigrationSummaryValue": {"properties": {}, "title": "MigrationSummaryValue", "type": "object"}},
         "additionalProperties": False,
         "properties": {
             "ms": {
-                "$ref": "#/$defs/MigrationSummaryValue",
+                **ms_ref,
                 "default": None,
                 "format": "summary",
                 "type": "string",

tests/unit_tests/test_read_only_field.py

@@ -11,6 +11,7 @@
 from pydantic_forms.types import strEnum
 from pydantic_forms.validators import read_only_field, read_only_list, LongText, OrganisationId
 from pydantic_forms.utils.schema import merge_json_schema
+from tests.unit_tests.helpers import PYDANTIC_VERSION
 
 
 class TestEnum(strEnum):
@@ -52,9 +53,11 @@ class Form(FormPage):
 
     actual = Form.model_json_schema()
 
-    if pydantic_version_short() in ("2.8", "2.9"):
+    if PYDANTIC_VERSION in ("2.8", "2.9"):
         # Behavior that was changed (fixed) in 2.10 https://github.com/pydantic/pydantic/pull/10692
-        del actual["properties"]["read_only"]["enum"]
+        expected["properties"]["read_only"]["enum"] = [
+            str(read_only_value) if isinstance(read_only_value, UUID) else read_only_value
+        ]
 
     assert actual == expected