diff options
author | Tim Graham <timograham@gmail.com> | 2016-04-07 22:04:45 -0400 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2016-04-08 10:12:33 -0400 |
commit | 92053acbb9160862c3e743a99ed8ccff8d4f8fd6 (patch) | |
tree | 50e7fd28a650f0e2352cf94f92e5a66d28a81988 /tests/admin_docs | |
parent | df8d8d4292684d6ffa7474f1e201aed486f02b53 (diff) | |
download | django-92053acbb9160862c3e743a99ed8ccff8d4f8fd6.tar.gz |
Fixed E128 flake8 warnings in tests/.
Diffstat (limited to 'tests/admin_docs')
-rw-r--r-- | tests/admin_docs/tests.py | 83 |
1 files changed, 28 insertions, 55 deletions
diff --git a/tests/admin_docs/tests.py b/tests/admin_docs/tests.py index 20c542a53b..ec35f92627 100644 --- a/tests/admin_docs/tests.py +++ b/tests/admin_docs/tests.py @@ -54,14 +54,11 @@ class AdminDocViewTests(TestDataMixin, AdminDocsTestCase): self.client.logout() response = self.client.get(reverse('django-admindocs-docroot'), follow=True) # Should display the login screen - self.assertContains(response, - '<input type="hidden" name="next" value="/admindocs/" />', html=True) + self.assertContains(response, '<input type="hidden" name="next" value="/admindocs/" />', html=True) self.client.force_login(self.superuser) response = self.client.get(reverse('django-admindocs-docroot')) self.assertContains(response, '<h1>Documentation</h1>', html=True) - self.assertContains(response, - '<h1 id="site-name"><a href="/admin/">Django ' - 'administration</a></h1>') + self.assertContains(response, '<h1 id="site-name"><a href="/admin/">Django administration</a></h1>') def test_bookmarklets(self): response = self.client.get(reverse('django-admindocs-bookmarklets')) @@ -77,16 +74,17 @@ class AdminDocViewTests(TestDataMixin, AdminDocsTestCase): def test_view_index(self): response = self.client.get(reverse('django-admindocs-views-index')) - self.assertContains(response, + self.assertContains( + response, '<h3><a href="/admindocs/views/django.contrib.admindocs.views.BaseAdminDocsView/">/admindocs/</a></h3>', - html=True) + html=True + ) self.assertContains(response, 'Views by namespace test') self.assertContains(response, 'Name: <code>test:func</code>.') def test_view_detail(self): - response = self.client.get( - reverse('django-admindocs-views-detail', - args=['django.contrib.admindocs.views.BaseAdminDocsView'])) + url = reverse('django-admindocs-views-detail', args=['django.contrib.admindocs.views.BaseAdminDocsView']) + response = self.client.get(url) # View docstring self.assertContains(response, 'Base view for admindocs views.') @@ -94,9 +92,8 @@ class AdminDocViewTests(TestDataMixin, AdminDocsTestCase): """ #23601 - Ensure the view exists in the URLconf. """ - response = self.client.get( - reverse('django-admindocs-views-detail', - args=['urlpatterns_reverse.nonimported_module.view'])) + url = reverse('django-admindocs-views-detail', args=['urlpatterns_reverse.nonimported_module.view']) + response = self.client.get(url) self.assertEqual(response.status_code, 404) self.assertNotIn("urlpatterns_reverse.nonimported_module", sys.modules) @@ -109,22 +106,20 @@ class AdminDocViewTests(TestDataMixin, AdminDocsTestCase): ) def test_template_detail(self): - response = self.client.get(reverse('django-admindocs-templates', - args=['admin_doc/template_detail.html'])) - self.assertContains(response, - '<h1>Template: "admin_doc/template_detail.html"</h1>', html=True) + response = self.client.get(reverse('django-admindocs-templates', args=['admin_doc/template_detail.html'])) + self.assertContains(response, '<h1>Template: "admin_doc/template_detail.html"</h1>', html=True) def test_missing_docutils(self): utils.docutils_is_available = False try: response = self.client.get(reverse('django-admindocs-docroot')) - self.assertContains(response, + self.assertContains( + response, '<h3>The admin documentation system requires Python\'s ' '<a href="http://docutils.sf.net/">docutils</a> library.</h3>', - html=True) - self.assertContains(response, - '<h1 id="site-name"><a href="/admin/">Django ' - 'administration</a></h1>') + html=True + ) + self.assertContains(response, '<h1 id="site-name"><a href="/admin/">Django administration</a></h1>') finally: utils.docutils_is_available = True @@ -200,18 +195,12 @@ class DefaultRoleTest(AdminDocsTestCase): ``django.contrib.admindocs.utils.parse_rst`` should use ``cmsreference`` as the default role. """ - markup = ('<p><a class="reference external" href="/admindocs/%s">' - 'title</a></p>\n') - self.assertEqual(utils.parse_rst('`title`', 'model'), - markup % 'models/title/') - self.assertEqual(utils.parse_rst('`title`', 'view'), - markup % 'views/title/') - self.assertEqual(utils.parse_rst('`title`', 'template'), - markup % 'templates/title/') - self.assertEqual(utils.parse_rst('`title`', 'filter'), - markup % 'filters/#title') - self.assertEqual(utils.parse_rst('`title`', 'tag'), - markup % 'tags/#title') + markup = '<p><a class="reference external" href="/admindocs/%s">title</a></p>\n' + self.assertEqual(utils.parse_rst('`title`', 'model'), markup % 'models/title/') + self.assertEqual(utils.parse_rst('`title`', 'view'), markup % 'views/title/') + self.assertEqual(utils.parse_rst('`title`', 'template'), markup % 'templates/title/') + self.assertEqual(utils.parse_rst('`title`', 'filter'), markup % 'filters/#title') + self.assertEqual(utils.parse_rst('`title`', 'tag'), markup % 'tags/#title') def test_publish_parts(self): """ @@ -220,8 +209,7 @@ class DefaultRoleTest(AdminDocsTestCase): ``cmsreference``. See #6681. """ import docutils - self.assertNotEqual(docutils.parsers.rst.roles.DEFAULT_INTERPRETED_ROLE, - 'cmsreference') + self.assertNotEqual(docutils.parsers.rst.roles.DEFAULT_INTERPRETED_ROLE, 'cmsreference') source = 'reST, `interpreted text`, default role.' markup = '<p>reST, <cite>interpreted text</cite>, default role.</p>\n' parts = docutils.core.publish_parts(source=source, writer_name="html4css1") @@ -286,21 +274,9 @@ class TestModelDetailView(TestDataMixin, AdminDocsTestCase): by a method """ company = Company.objects.create(name="Django") - person = Person.objects.create( - first_name="Human", - last_name="User", - company=company - ) - - self.assertEqual( - get_return_data_type(person.get_status_count.__name__), - 'Integer' - ) - - self.assertEqual( - get_return_data_type(person.get_groups_list.__name__), - 'List' - ) + person = Person.objects.create(first_name="Human", last_name="User", company=company) + self.assertEqual(get_return_data_type(person.get_status_count.__name__), 'Integer') + self.assertEqual(get_return_data_type(person.get_groups_list.__name__), 'List') def test_descriptions_render_correctly(self): """ @@ -361,10 +337,7 @@ class TestModelDetailView(TestDataMixin, AdminDocsTestCase): A model with ``related_name`` of `+` should not show backward relationship links in admin docs """ - response = self.client.get( - reverse('django-admindocs-models-detail', - args=['admin_docs', 'family'])) - + response = self.client.get(reverse('django-admindocs-models-detail', args=['admin_docs', 'family'])) fields = response.context_data.get('fields') self.assertEqual(len(fields), 2) |