Skip to content

Commit

Permalink
Reenable missing tests for custom image models
Browse files Browse the repository at this point in the history
  • Loading branch information
@yakky
yakky committed Jun 2, 2018
1 parent eccd853 commit 006a1cf
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 75 deletions.
8 changes: 7 additions & 1 deletion filer/admin/imageadmin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,17 @@ class Media(object):


class ImageAdmin(FileAdmin):
change_form_template = 'admin/filer/image/change_form.html'
form = ImageAdminForm


if FILER_IMAGE_MODEL == 'filer.Image':
extra_main_fields = ('author', 'default_alt_text', 'default_caption',)
else:
extra_main_fields = ('default_alt_text', 'default_caption',)

ImageAdmin.fieldsets = ImageAdmin.build_fieldsets(
extra_main_fields=('author', 'default_alt_text', 'default_caption',),
extra_main_fields=extra_main_fields,
extra_fieldsets=(
(_('Subject location'), {
'fields': ('subject_location',),
Expand Down
1 change: 1 addition & 0 deletions filer/test_utils/custom_image/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class Image(BaseImage):
extra_description = models.TextField()

class Meta(BaseImage.Meta):
swappable = 'FILER_IMAGE_MODEL'
app_label = 'custom_image'
if GTE_DJANGO_1_10:
default_manager_name = 'objects'
145 changes: 71 additions & 74 deletions filer/tests/admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -920,9 +920,9 @@ class DontSearchOwnerEmailFolderAdmin(FolderAdmin):
self.assertEqual(len(folder_qs), 0)

def test_search_special_characters(self):
"""
"""
Regression test for https://github.com/divio/django-filer/pull/945.
Because of a wrong unquoting function being used, searches with
Because of a wrong unquoting function being used, searches with
some "_XX" sequences got unquoted as unicode characters.
For example, "_ec" gets unquoted as u'ì'.
"""
Expand Down Expand Up @@ -1085,40 +1085,38 @@ def test_regular_mode_image_with_folder_delete(self):
)

def test_pick_mode_image_save(self):
if not FILER_IMAGE_MODEL:
image = self.create_image(folder=None)
base_url = image.get_admin_change_url()
pick_url = base_url + '?_pick=file&_popup=1'

response = self.client.get(pick_url)
self.assertEqual(response.status_code, 200)
self.assertContains(response, '<input type="hidden" name="_pick" value="file"')
self.assertContains(response, '<input type="hidden" name="_popup" value="1"')
data = {'_popup': '1'}
data.update(model_to_dict(image, all=True))
response = self.client.post(pick_url, data=data)
self.assertRedirects(
response=response,
expected_url=reverse(
'admin:filer-directory_listing-unfiled_images'
) + '?_pick=file&_popup=1'
)
image = self.create_image(folder=None)
base_url = image.get_admin_change_url()
pick_url = base_url + '?_pick=file&_popup=1'

response = self.client.get(pick_url)
self.assertEqual(response.status_code, 200)
self.assertContains(response, '<input type="hidden" name="_pick" value="file"')
self.assertContains(response, '<input type="hidden" name="_popup" value="1"')
data = {'_popup': '1'}
data.update(model_to_dict(image, all=True))
response = self.client.post(pick_url, data=data)
self.assertRedirects(
response=response,
expected_url=reverse(
'admin:filer-directory_listing-unfiled_images'
) + '?_pick=file&_popup=1'
)

def test_regular_mode_image_save(self):
if not FILER_IMAGE_MODEL:
image = self.create_image(folder=None)
base_url = image.get_admin_change_url()
image = self.create_image(folder=None)
base_url = image.get_admin_change_url()

response = self.client.get(base_url)
self.assertEqual(response.status_code, 200)
data = model_to_dict(image, all=True)
response = self.client.post(base_url, data=data)
self.assertRedirects(
response=response,
expected_url=reverse(
'admin:filer-directory_listing-unfiled_images'
)
response = self.client.get(base_url)
self.assertEqual(response.status_code, 200)
data = model_to_dict(image, all=True)
response = self.client.post(base_url, data=data)
self.assertRedirects(
response=response,
expected_url=reverse(
'admin:filer-directory_listing-unfiled_images'
)
)

def test_image_subject_location(self):
def do_test_image_subject_location(subject_location=None,
Expand All @@ -1143,56 +1141,55 @@ def do_test_image_subject_location(subject_location=None,
self.assertEqual(saved_image.subject_location,
image.subject_location)

if not FILER_IMAGE_MODEL:
for subject_location in '', '10,10', '800,0', '0,600', '800,600':
do_test_image_subject_location(subject_location=subject_location)
for subject_location in '', '10,10', '800,0', '0,600', '800,600':
do_test_image_subject_location(subject_location=subject_location)

for subject_location in '-1,1', '801,0', '801,601':
do_test_image_subject_location(subject_location=subject_location,
should_succeed=False)
for subject_location in '-1,1', '801,0', '801,601':
do_test_image_subject_location(subject_location=subject_location,
should_succeed=False)

def test_pick_mode_image_with_folder_save(self):
if not FILER_IMAGE_MODEL:
parent_folder = Folder.objects.create(name='parent')
image = self.create_image(folder=parent_folder)
base_url = image.get_admin_change_url()
pick_url = base_url + '?_pick=file&_popup=1'

response = self.client.get(pick_url)
self.assertEqual(response.status_code, 200)
self.assertContains(response,
'<input type="hidden" name="_pick" value="file"')
self.assertContains(response,
'<input type="hidden" name="_popup" value="1"')
data = {'_popup': '1'}
data.update(model_to_dict(image, all=True))
response = self.client.post(pick_url, data=data)
self.assertRedirects(
response=response,
expected_url=reverse(
'admin:filer-directory_listing',
args=[parent_folder.id]
) + '?_pick=file&_popup=1'
)
parent_folder = Folder.objects.create(name='parent')
image = self.create_image(folder=parent_folder)
base_url = image.get_admin_change_url()
pick_url = base_url + '?_pick=file&_popup=1'

response = self.client.get(pick_url)
self.assertEqual(response.status_code, 200)

response.render()
self.assertContains(response,
'<input type="hidden" name="_pick" value="file"')
self.assertContains(response,
'<input type="hidden" name="_popup" value="1"')
data = {'_popup': '1'}
data.update(model_to_dict(image, all=True))
response = self.client.post(pick_url, data=data)
self.assertRedirects(
response=response,
expected_url=reverse(
'admin:filer-directory_listing',
args=[parent_folder.id]
) + '?_pick=file&_popup=1'
)

def test_regular_mode_image_with_folder_save(self):
if not FILER_IMAGE_MODEL:
parent_folder = Folder.objects.create(name='parent')
image = self.create_image(folder=parent_folder)
base_url = image.get_admin_change_url()
parent_folder = Folder.objects.create(name='parent')
image = self.create_image(folder=parent_folder)
base_url = image.get_admin_change_url()

response = self.client.get(base_url)
self.assertEqual(response.status_code, 200)
response = self.client.get(base_url)
self.assertEqual(response.status_code, 200)

data = model_to_dict(image, all=True)
response = self.client.post(base_url, data=data)
self.assertRedirects(
response=response,
expected_url=reverse(
'admin:filer-directory_listing',
args=[parent_folder.id]
)
data = model_to_dict(image, all=True)
response = self.client.post(base_url, data=data)
self.assertRedirects(
response=response,
expected_url=reverse(
'admin:filer-directory_listing',
args=[parent_folder.id]
)
)

def test_pick_mode_folder_save(self):
folder = Folder.objects.create(name='foo')
Expand Down

0 comments on commit 006a1cf

Please sign in to comment.