summaryrefslogtreecommitdiff
path: root/tests/generic_inline_admin
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2013-11-03 09:51:49 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2013-11-03 09:51:49 -0800
commit7288e1b02b2504b1694fe14df2d81e6a354c5610 (patch)
treea4bb2a34ffc03d4939c6d8f961bddc1918b8fd9c /tests/generic_inline_admin
parent91078f566904e49fbf99ec6375ba627e821f6143 (diff)
parent4f151da1e5e9bf527548a5737d9cd314e3abc68e (diff)
Merge pull request #1852 from jasonamyers/cleanup/PEP8
Cleanup/pep8 tests
Diffstat (limited to 'tests/generic_inline_admin')
-rw-r--r--tests/generic_inline_admin/admin.py1
-rw-r--r--tests/generic_inline_admin/models.py2
-rw-r--r--tests/generic_inline_admin/tests.py3
3 files changed, 6 insertions, 0 deletions
diff --git a/tests/generic_inline_admin/admin.py b/tests/generic_inline_admin/admin.py
index 1917024fa5..c701e4a9eb 100644
--- a/tests/generic_inline_admin/admin.py
+++ b/tests/generic_inline_admin/admin.py
@@ -7,6 +7,7 @@ from .models import (Media, PhoneNumber, Episode, EpisodeExtra, Contact,
site = admin.AdminSite(name="admin")
+
class MediaInline(generic.GenericTabularInline):
model = Media
diff --git a/tests/generic_inline_admin/models.py b/tests/generic_inline_admin/models.py
index cc7de62454..af3a474cdf 100644
--- a/tests/generic_inline_admin/models.py
+++ b/tests/generic_inline_admin/models.py
@@ -34,6 +34,7 @@ class Media(models.Model):
# Generic inline with extra = 0
#
+
class EpisodeExtra(Episode):
pass
@@ -67,6 +68,7 @@ class Contact(models.Model):
name = models.CharField(max_length=50)
phone_numbers = generic.GenericRelation(PhoneNumber)
+
#
# Generic inline with can_delete=False
#
diff --git a/tests/generic_inline_admin/tests.py b/tests/generic_inline_admin/tests.py
index 23f17f7b22..09a802a1bc 100644
--- a/tests/generic_inline_admin/tests.py
+++ b/tests/generic_inline_admin/tests.py
@@ -129,6 +129,7 @@ class GenericAdminViewTest(TestCase):
formset = inline_formset(instance=e)
self.assertTrue(formset.get_queryset().ordered)
+
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
class GenericInlineAdminParametersTest(TestCase):
urls = "generic_inline_admin.urls"
@@ -210,6 +211,7 @@ class GenericInlineAdminWithUniqueTogetherTest(TestCase):
response = self.client.post('/generic_inline_admin/admin/generic_inline_admin/contact/add/', post_data)
self.assertEqual(response.status_code, 302) # redirect somewhere
+
class NoInlineDeletionTest(TestCase):
urls = "generic_inline_admin.urls"
@@ -224,6 +226,7 @@ class NoInlineDeletionTest(TestCase):
class MockRequest(object):
pass
+
class MockSuperUser(object):
def has_perm(self, perm):
return True