mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Code Issues Releases Wiki Activity

update test to handle django-1.10 change in FileField storage

Browse Source
This commit is contained in:
Paul J Stevens 2016-06-17 14:24:07 +02:00 committed by Matt Westcott
parent 3e38bab785
commit 865841eedf
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wagtail/wagtailadmin/tests/test_pages_views.py
View File

@ -890,8 +890,15 @@ class TestPageEdit(TestCase, WagtailTestUtils):
# Check the new file exists
file_page = FilePage.objects.get()
self.assertEqual(file_page.file_field.name,
os.path.join('.', file_upload.name))
# In Django < 1.10 the file_field.name starts with ./ whereas in 1.10 it is the basename;
# we test against os.path.basename(file_page.file_field.name) so that both possibilities
# are handled. os.path.basename can be removed when support for Django <= 1.9 is dropped.
# (hello, future person grepping for the string `if DJANGO_VERSION < (1, 10)`)
self.assertEqual(os.path.basename(file_page.file_field.name),
os.path.basename(file_upload.name))
self.assertTrue(os.path.exists(file_page.file_field.path))
self.assertEqual(file_page.file_field.read(), b"A new file")
@ -919,10 +926,16 @@ class TestPageEdit(TestCase, WagtailTestUtils):
# Publish the draft just created
FilePage.objects.get().get_latest_revision().publish()
# In Django < 1.10 the file_field.name starts with ./ whereas in 1.10 it is the basename;
# we test against os.path.basename(file_page.file_field.name) so that both possibilities
# are handled. os.path.basename can be removed when support for Django <= 1.9 is dropped.
# (hello, future person grepping for the string `if DJANGO_VERSION < (1, 10)`)
# Get the file page, check the file is set
file_page = FilePage.objects.get()
self.assertEqual(file_page.file_field.name,
os.path.join('.', file_upload.name))
self.assertEqual(os.path.basename(file_page.file_field.name),
os.path.basename(file_upload.name))
self.assertTrue(os.path.exists(file_page.file_field.path))
self.assertEqual(file_page.file_field.read(), b"A new file")