diff options
| author | Jason Myers <jason@jasonamyers.com> | 2013-11-02 23:36:09 -0500 |
|---|---|---|
| committer | Jason Myers <jason@jasonamyers.com> | 2013-11-02 23:50:49 -0500 |
| commit | 7a61c68c50d3837c50e35c252fd76220f08b5290 (patch) | |
| tree | 586f16a3f02c2b45ffb3dd2af834c0ef604e099c /tests/admin_views | |
| parent | 0fdb692c6c94d912f17a3e2ad12413fb072d38ec (diff) | |
PEP8 cleanup
Signed-off-by: Jason Myers <jason@jasonamyers.com>
Diffstat (limited to 'tests/admin_views')
| -rw-r--r-- | tests/admin_views/models.py | 22 | ||||
| -rw-r--r-- | tests/admin_views/tests.py | 35 | ||||
| -rw-r--r-- | tests/admin_views/views.py | 1 |
3 files changed, 38 insertions, 20 deletions
diff --git a/tests/admin_views/models.py b/tests/admin_views/models.py index 4dcca9a4cb..e2b6a00261 100644 --- a/tests/admin_views/models.py +++ b/tests/admin_views/models.py @@ -120,11 +120,13 @@ class Color(models.Model): def __str__(self): return self.value + # we replicate Color to register with another ModelAdmin class Color2(Color): class Meta: proxy = True + @python_2_unicode_compatible class Thing(models.Model): title = models.CharField(max_length=20) @@ -613,10 +615,12 @@ class PrePopulatedPostLargeSlug(models.Model): published = models.BooleanField(default=False) slug = models.SlugField(max_length=1000) + class AdminOrderedField(models.Model): order = models.IntegerField() stuff = models.CharField(max_length=200) + class AdminOrderedModelMethod(models.Model): order = models.IntegerField() stuff = models.CharField(max_length=200) @@ -625,14 +629,17 @@ class AdminOrderedModelMethod(models.Model): return self.order some_order.admin_order_field = 'order' + class AdminOrderedAdminMethod(models.Model): order = models.IntegerField() stuff = models.CharField(max_length=200) + class AdminOrderedCallable(models.Model): order = models.IntegerField() stuff = models.CharField(max_length=200) + @python_2_unicode_compatible class Report(models.Model): title = models.CharField(max_length=100) @@ -651,6 +658,7 @@ class MainPrepopulated(models.Model): slug1 = models.SlugField(blank=True) slug2 = models.SlugField(blank=True) + class RelatedPrepopulated(models.Model): parent = models.ForeignKey(MainPrepopulated) name = models.CharField(max_length=75) @@ -671,6 +679,7 @@ class UnorderedObject(models.Model): name = models.CharField(max_length=255) bool = models.BooleanField(default=True) + class UndeletableObject(models.Model): """ Model whose show_delete in admin change_view has been disabled @@ -678,30 +687,36 @@ class UndeletableObject(models.Model): """ name = models.CharField(max_length=255) + class UnchangeableObject(models.Model): """ Model whose change_view is disabled in admin Refs #20640. """ + class UserMessenger(models.Model): """ Dummy class for testing message_user functions on ModelAdmin """ + class Simple(models.Model): """ Simple model with nothing on it for use in testing """ + class Choice(models.Model): choice = models.IntegerField(blank=True, null=True, choices=((1, 'Yes'), (0, 'No'), (None, 'No opinion'))) + class _Manager(models.Manager): def get_queryset(self): return super(_Manager, self).get_queryset().filter(pk__gt=1) + class FilteredManager(models.Model): def __str__(self): return "PK=%d" % self.pk @@ -709,26 +724,33 @@ class FilteredManager(models.Model): pk_gt_1 = _Manager() objects = models.Manager() + class EmptyModelVisible(models.Model): """ See ticket #11277. """ + class EmptyModelHidden(models.Model): """ See ticket #11277. """ + class EmptyModelMixin(models.Model): """ See ticket #11277. """ + class State(models.Model): name = models.CharField(max_length=100) + class City(models.Model): state = models.ForeignKey(State) name = models.CharField(max_length=100) + class Restaurant(models.Model): city = models.ForeignKey(City) name = models.CharField(max_length=100) + class Worker(models.Model): work_at = models.ForeignKey(Restaurant) name = models.CharField(max_length=50) diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 91af9521a3..0ec9f25479 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -84,8 +84,8 @@ class AdminViewBasicTestCase(TestCase): """ self.assertEqual(response.status_code, 200) self.assertTrue(response.content.index(force_bytes(text1)) < response.content.index(force_bytes(text2)), - failing_msg - ) + failing_msg) + class AdminViewBasicTest(AdminViewBasicTestCase): def testTrailingSlashRequired(self): @@ -94,8 +94,8 @@ class AdminViewBasicTest(AdminViewBasicTestCase): """ response = self.client.get('/test_admin/%s/admin_views/article/add' % self.urlbit) self.assertRedirects(response, - '/test_admin/%s/admin_views/article/add/' % self.urlbit, status_code=301 - ) + '/test_admin/%s/admin_views/article/add/' % self.urlbit, + status_code=301) def testBasicAddGet(self): """ @@ -109,8 +109,7 @@ class AdminViewBasicTest(AdminViewBasicTestCase): response = self.client.get('/test_admin/%s/admin_views/section/add/' % self.urlbit, {'name': 'My Section'}) self.assertEqual(response.status_code, 200) self.assertContains(response, 'value="My Section"', - msg_prefix="Couldn't find an input with the right value in the response" - ) + msg_prefix="Couldn't find an input with the right value in the response") def testBasicEditGet(self): """ @@ -394,11 +393,9 @@ class AdminViewBasicTest(AdminViewBasicTestCase): response = self.client.get('/test_admin/%s/admin_views/thing/' % self.urlbit) self.assertEqual(response.status_code, 200) self.assertContains(response, '<div id="changelist-filter">', - msg_prefix="Expected filter not found in changelist view" - ) + msg_prefix="Expected filter not found in changelist view") self.assertNotContains(response, '<a href="?color__id__exact=3">Blue</a>', - msg_prefix="Changelist filter not correctly limited by limit_choices_to" - ) + msg_prefix="Changelist filter not correctly limited by limit_choices_to") def testRelationSpanningFilters(self): response = self.client.get('/test_admin/%s/admin_views/chapterxtra1/' % @@ -1557,7 +1554,7 @@ class AdminViewStringPrimaryKeyTest(TestCase): response = self.client.get('/test_admin/admin/') counted_presence_after = response.content.count(force_bytes(should_contain)) self.assertEqual(counted_presence_before - 1, - counted_presence_after) + counted_presence_after) def test_logentry_get_admin_url(self): "LogEntry.get_admin_url returns a URL to edit the entry's object or None for non-existent (possibly deleted) models" @@ -1612,13 +1609,13 @@ class AdminViewStringPrimaryKeyTest(TestCase): def test_change_view_history_link(self): """Object history button link should work and contain the pk value quoted.""" url = reverse('admin:%s_modelwithstringprimarykey_change' % - ModelWithStringPrimaryKey._meta.app_label, - args=(quote(self.pk),)) + ModelWithStringPrimaryKey._meta.app_label, + args=(quote(self.pk),)) response = self.client.get(url) self.assertEqual(response.status_code, 200) expected_link = reverse('admin:%s_modelwithstringprimarykey_history' % - ModelWithStringPrimaryKey._meta.app_label, - args=(quote(self.pk),)) + ModelWithStringPrimaryKey._meta.app_label, + args=(quote(self.pk),)) self.assertContains(response, '<a href="%s" class="historylink"' % expected_link) @@ -2553,8 +2550,7 @@ action)</option> response = self.client.get('/test_admin/admin/admin_views/oldsubscriber/') self.assertEqual(response.context["action_form"], None) self.assertContains(response, 'jquery.min.js', - msg_prefix="jQuery missing from admin pages for model with no admin actions" - ) + msg_prefix="jQuery missing from admin pages for model with no admin actions") def test_action_column_class(self): "Tests that the checkbox column class is present in the response" @@ -3631,8 +3627,7 @@ class ReadonlyTest(TestCase): self.assertContains(response, "InlineMultiline<br />test<br />string") self.assertContains(response, - formats.localize(datetime.date.today() - datetime.timedelta(days=7)) - ) + formats.localize(datetime.date.today() - datetime.timedelta(days=7))) self.assertContains(response, '<div class="form-row field-coolness">') self.assertContains(response, '<div class="form-row field-awesomeness_level">') @@ -3829,7 +3824,7 @@ class UserAdminTest(TestCase): adminform = response.context['adminform'] self.assertTrue('password' not in adminform.form.errors) self.assertEqual(adminform.form.errors['password2'], - ["The two password fields didn't match."]) + ["The two password fields didn't match."]) def test_user_fk_popup(self): """Quick user addition in a FK popup shouldn't invoke view for further user customization""" diff --git a/tests/admin_views/views.py b/tests/admin_views/views.py index bb5f24ebfe..cfae496aba 100644 --- a/tests/admin_views/views.py +++ b/tests/admin_views/views.py @@ -1,6 +1,7 @@ from django.contrib.admin.views.decorators import staff_member_required from django.http import HttpResponse + @staff_member_required def secure_view(request): return HttpResponse('%s' % request.POST) |
