Fixed #8918 -- Made FileField.upload_to optional.

Thanks leahculver for the suggestion and dc and vajrasky for work
on the patch.

2 files changed, 7 insertions, 0 deletions

diff --git a/tests/files/models.py b/tests/files/models.py
index 4134472748..eea3ddaf09 100644
--- a/tests/files/models.py
+++ b/tests/files/models.py
@@ -28,3 +28,4 @@ class Storage(models.Model):
     custom = models.FileField(storage=temp_storage, upload_to=custom_upload_to)
     random = models.FileField(storage=temp_storage, upload_to=random_upload_to)
     default = models.FileField(storage=temp_storage, upload_to='tests', default='tests/default.txt')
+    empty = models.FileField(storage=temp_storage)
diff --git a/tests/files/tests.py b/tests/files/tests.py
index 36664fa83a..40aa9f6d75 100644
--- a/tests/files/tests.py
+++ b/tests/files/tests.py
@@ -106,6 +106,12 @@ class FileStorageTests(TestCase):
         obj4.random.save("random_file", ContentFile("random content"))
         self.assertTrue(obj4.random.name.endswith("/random_file"))
 
+        # upload_to can be empty, meaning it does not use subdirectory.
+        obj5 = Storage()
+        obj5.empty.save('django_test.txt', ContentFile('more content'))
+        self.assertEqual(obj5.empty.name, "./django_test.txt")
+        self.assertEqual(obj5.empty.read(), b"more content")
+
     def test_file_object(self):
         # Create sample file
         temp_storage.save('tests/example.txt', ContentFile('some content'))