mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Refs #27795 -- Removed force_bytes/text() usage in tests.

Browse Source
This commit is contained in:
Tim Graham
2018-02-07 14:20:04 -05:00
committed by GitHub
parent b38532cd6b
commit fa75b2cb51
10 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/admin_views/tests.py
View File

@@ -29,7 +29,7 @@ from django.test.utils import override_script_prefix, patch_logger
from django.urls import NoReverseMatch, resolve, reverse
from django.utils import formats, translation
from django.utils.cache import get_max_age
from django.utils.encoding import force_bytes, force_text, iri_to_uri
from django.utils.encoding import iri_to_uri
from django.utils.html import escape
from django.utils.http import urlencode
@@ -183,8 +183,8 @@ class AdminViewBasicTestCase(TestCase):
"""
self.assertEqual(response.status_code, 200)
self.assertLess(
response.content.index(force_bytes(text1)),
response.content.index(force_bytes(text2)),
response.content.index(text1.encode()),
response.content.index(text2.encode()),
(failing_msg or '') + '\nResponse:\n' + response.content.decode(response.charset)
)
@@ -2161,16 +2161,14 @@ class AdminViewDeletedObjectsTest(TestCase):
cause them to be scheduled for deletion.
"""
pattern = re.compile(
force_bytes(
r'<li>Plot: <a href="%s">World Domination</a>\s*<ul>\s*'
r'<li>Plot details: <a href="%s">almost finished</a>' % (
reverse('admin:admin_views_plot_change', args=(self.pl1.pk,)),
reverse('admin:admin_views_plotdetails_change', args=(self.pd1.pk,)),
)
r'<li>Plot: <a href="%s">World Domination</a>\s*<ul>\s*'
r'<li>Plot details: <a href="%s">almost finished</a>' % (
reverse('admin:admin_views_plot_change', args=(self.pl1.pk,)),
reverse('admin:admin_views_plotdetails_change', args=(self.pd1.pk,)),
)
)
response = self.client.get(reverse('admin:admin_views_villain_delete', args=(self.v1.pk,)))
self.assertRegex(response.content, pattern)
self.assertRegex(response.content.decode(), pattern)
def test_cyclic(self):
"""
@@ -5455,7 +5453,7 @@ class AdminKeepChangeListFiltersTests(TestCase):
# Check the `change_view` link has the correct querystring.
detail_link = re.search(
'<a href="(.*?)">{}</a>'.format(self.joepublicuser.username),
force_text(response.content)
response.content.decode()
)
self.assertURLEqual(detail_link.group(1), self.get_change_url())
@@ -5467,21 +5465,21 @@ class AdminKeepChangeListFiltersTests(TestCase):
# Check the form action.
form_action = re.search(
'<form action="(.*?)" method="post" id="user_form".*?>',
force_text(response.content)
response.content.decode()
)
self.assertURLEqual(form_action.group(1), '?%s' % self.get_preserved_filters_querystring())
# Check the history link.
history_link = re.search(
'<a href="(.*?)" class="historylink">History</a>',
force_text(response.content)
response.content.decode()
)
self.assertURLEqual(history_link.group(1), self.get_history_url())
# Check the delete link.
delete_link = re.search(
'<a href="(.*?)" class="deletelink">Delete</a>',
force_text(response.content)
response.content.decode()
)
self.assertURLEqual(delete_link.group(1), self.get_delete_url())
@@ -5531,7 +5529,7 @@ class AdminKeepChangeListFiltersTests(TestCase):
# Check the form action.
form_action = re.search(
'<form action="(.*?)" method="post" id="user_form".*?>',
force_text(response.content)
response.content.decode()
)
self.assertURLEqual(form_action.group(1), '?%s' % self.get_preserved_filters_querystring())