Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-17 13:31:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed crash when no file selected

Browse source
This commit is contained in:
Karl Hobley 2014-10-29 15:44:39 +00:00
parent 5f3d7e2820
commit 89e2db1f27
2 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wagtail/wagtailimages/fields.py
View file

@ -110,7 +110,8 @@ class WagtailImageField(ImageField):
def to_python(self, data):
f = super(WagtailImageField, self).to_python(data)
self.check_image_file_size(f)
self.check_image_file_format(f)
if f is not None:
self.check_image_file_size(f)
self.check_image_file_format(f)
return f

42
wagtail/wagtailimages/tests/test_admin_views.py
View file

@ -75,6 +75,18 @@ class TestImageAddView(TestCase, WagtailTestUtils):
self.assertEqual(image.width, 640)
self.assertEqual(image.height, 480)
def test_add_no_file_selected(self):
response = self.post({
'title': "Test image",
})
# Shouldn't redirect anywhere
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'wagtailimages/images/add.html')
# The form should have an error
self.assertFormError(response, 'form', 'file', "This field is required.")
class TestImageEditView(TestCase, WagtailTestUtils):
def setUp(self):
@ -203,7 +215,35 @@ class TestImageChooserUploadView(TestCase, WagtailTestUtils):
self.assertTemplateUsed(response, 'wagtailimages/chooser/chooser.html')
self.assertTemplateUsed(response, 'wagtailimages/chooser/chooser.js')
# TODO: Test uploading through chooser
def test_upload(self):
response = self.client.post(reverse('wagtailimages_chooser_upload'), {
'title': "Test image",
'file': SimpleUploadedFile('test.png', get_test_image_file().file.getvalue()),
})
# Check response
self.assertEqual(response.status_code, 200)
# Check that the image was created
images = Image.objects.filter(title="Test image")
self.assertEqual(images.count(), 1)
# Test that size was populated correctly
image = images.first()
self.assertEqual(image.width, 640)
self.assertEqual(image.height, 480)
def test_upload_no_file_selected(self):
response = self.client.post(reverse('wagtailimages_chooser_upload'), {
'title': "Test image",
})
# Shouldn't redirect anywhere
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'wagtailimages/chooser/chooser.html')
# The form should have an error
self.assertFormError(response, 'uploadform', 'file', "This field is required.")
class TestMultipleImageUploader(TestCase, WagtailTestUtils):