summaryrefslogtreecommitdiff
path: root/tests/file_storage
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2019-08-18 11:40:11 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-08-18 20:34:58 +0200
commitd1c2e6dd04d4ddc8ace17e6abfed16ac46459d1e (patch)
tree89284f40bbda4237df30210356608d2b2d2b9ab6 /tests/file_storage
parentaf69842dbd98e69519f1263eca2619c3165ba13b (diff)
downloaddjango-d1c2e6dd04d4ddc8ace17e6abfed16ac46459d1e.tar.gz
Refs #28428 -- Made FileField.upload_to support pathlib.Path.
Diffstat (limited to 'tests/file_storage')
-rw-r--r--tests/file_storage/models.py1
-rw-r--r--tests/file_storage/tests.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/file_storage/models.py b/tests/file_storage/models.py
index 96805f6ad5..8085a8bb1a 100644
--- a/tests/file_storage/models.py
+++ b/tests/file_storage/models.py
@@ -38,6 +38,7 @@ class Storage(models.Model):
normal = models.FileField(storage=temp_storage, upload_to='tests')
custom = models.FileField(storage=temp_storage, upload_to=custom_upload_to)
pathlib_callable = models.FileField(storage=temp_storage, upload_to=pathlib_upload_to)
+ pathlib_direct = models.FileField(storage=temp_storage, upload_to=Path('bar'))
random = models.FileField(storage=temp_storage, upload_to=random_upload_to)
custom_valid_name = models.FileField(
storage=CustomValidNameStorage(location=temp_storage_location),
diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py
index 6edfd2902c..1c4176014c 100644
--- a/tests/file_storage/tests.py
+++ b/tests/file_storage/tests.py
@@ -796,6 +796,8 @@ class FileFieldStorageTests(TestCase):
obj = Storage()
obj.pathlib_callable.save('some_file1.txt', ContentFile('some content'))
self.assertEqual(obj.pathlib_callable.name, 'bar/some_file1.txt')
+ obj.pathlib_direct.save('some_file2.txt', ContentFile('some content'))
+ self.assertEqual(obj.pathlib_direct.name, 'bar/some_file2.txt')
obj.random.close()
def test_random_upload_to(self):