fix FilePathField required argument (#8805)

radekwlsk · web-flow · commit 89d6ce7d438a · 2023-01-05T01:21:57.000+06:00
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -1480,6 +1480,7 @@ def __init__(self, path, match=None, recursive=False, allow_files=True,
             allow_folders=allow_folders, required=required
         )
         kwargs['choices'] = field.choices
+        kwargs['required'] = required
         super().__init__(**kwargs)
 
 
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -15,7 +15,8 @@
 import rest_framework
 from rest_framework import exceptions, serializers
 from rest_framework.fields import (
-    BuiltinSignatureError, DjangoImageField, is_simple_callable
+    BuiltinSignatureError, DjangoImageField, SkipField, empty,
+    is_simple_callable
 )
 from tests.models import UUIDForeignKeyTarget
 
@@ -2390,6 +2391,21 @@ def test_fully_qualified_when_request_in_context(self):
         assert value == 'http://example.com/example.txt'
 
 
+# Tests for FilePathField.
+# --------------------
+
+class TestFilePathFieldRequired:
+    def test_required_passed_to_both_django_file_path_field_and_base(self):
+        field = serializers.FilePathField(
+            path=os.path.abspath(os.path.dirname(__file__)),
+            required=False,
+        )
+        assert "" in field.choices  # Django adds empty choice if not required
+        assert field.required is False
+        with pytest.raises(SkipField):
+            field.run_validation(empty)
+
+
 # Tests for SerializerMethodField.
 # --------------------------------
 

Original file line number	Diff line number	Diff line change
`@@ -1480,6 +1480,7 @@ def __init__(self, path, match=None, recursive=False, allow_files=True,`
`1480`	`1480`	`allow_folders=allow_folders, required=required`
`1481`	`1481`	`)`
`1482`	`1482`	`kwargs['choices'] = field.choices`
	`1483`	`+ kwargs['required'] = required`
`1483`	`1484`	`super().__init__(**kwargs)`
`1484`	`1485`
`1485`	`1486`