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

Refs #27398 -- Simplified some tests with assertRedirects().

Browse Source
This commit is contained in:
Tim Graham 2018-06-20 14:08:56 -04:00
parent 24959e48d9
commit 5d98d53fab
2 changed files with 9 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tests/admin_views/tests.py
View File

@ -1827,7 +1827,6 @@ class AdminViewPermissionsTest(TestCase):
response = self.client.get(change_url_3) response = self.client.get(change_url_3)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
response = self.client.post(change_url_3, {'name': 'changed'}) response = self.client.post(change_url_3, {'name': 'changed'})
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, self.index_url) self.assertRedirects(response, self.index_url)
self.assertEqual(RowLevelChangePermissionModel.objects.get(id=3).name, 'odd id mult 3') self.assertEqual(RowLevelChangePermissionModel.objects.get(id=3).name, 'odd id mult 3')
response = self.client.get(change_url_6) response = self.client.get(change_url_6)
@ -5559,7 +5558,7 @@ class AdminKeepChangeListFiltersTests(TestCase):
def setUp(self): def setUp(self):
self.client.force_login(self.superuser) self.client.force_login(self.superuser)
def assertURLEqual(self, url1, url2): def assertURLEqual(self, url1, url2, msg_prefix=''):
""" """
Assert that two URLs are equal despite the ordering Assert that two URLs are equal despite the ordering
of their querystring. Refs #22360. of their querystring. Refs #22360.
@ -5730,31 +5729,19 @@ class AdminKeepChangeListFiltersTests(TestCase):
post_data['_save'] = 1 post_data['_save'] = 1
response = self.client.post(self.get_change_url(), data=post_data) response = self.client.post(self.get_change_url(), data=post_data)
self.assertEqual(response.status_code, 302) self.assertRedirects(response, self.get_changelist_url())
self.assertURLEqual(
response.url,
self.get_changelist_url()
)
post_data.pop('_save') post_data.pop('_save')
# Test redirect on "Save and continue". # Test redirect on "Save and continue".
post_data['_continue'] = 1 post_data['_continue'] = 1
response = self.client.post(self.get_change_url(), data=post_data) response = self.client.post(self.get_change_url(), data=post_data)
self.assertEqual(response.status_code, 302) self.assertRedirects(response, self.get_change_url())
self.assertURLEqual(
response.url,
self.get_change_url()
)
post_data.pop('_continue') post_data.pop('_continue')
# Test redirect on "Save and add new". # Test redirect on "Save and add new".
post_data['_addanother'] = 1 post_data['_addanother'] = 1
response = self.client.post(self.get_change_url(), data=post_data) response = self.client.post(self.get_change_url(), data=post_data)
self.assertEqual(response.status_code, 302) self.assertRedirects(response, self.get_add_url())
self.assertURLEqual(
response.url,
self.get_add_url()
)
post_data.pop('_addanother') post_data.pop('_addanother')
def test_add_view(self): def test_add_view(self):
@ -5778,43 +5765,27 @@ class AdminKeepChangeListFiltersTests(TestCase):
# Test redirect on "Save". # Test redirect on "Save".
post_data['_save'] = 1 post_data['_save'] = 1
response = self.client.post(self.get_add_url(), data=post_data) response = self.client.post(self.get_add_url(), data=post_data)
self.assertEqual(response.status_code, 302) self.assertRedirects(response, self.get_change_url(User.objects.get(username='dummy').pk))
self.assertURLEqual(
response.url,
self.get_change_url(User.objects.get(username='dummy').pk)
)
post_data.pop('_save') post_data.pop('_save')
# Test redirect on "Save and continue". # Test redirect on "Save and continue".
post_data['username'] = 'dummy2' post_data['username'] = 'dummy2'
post_data['_continue'] = 1 post_data['_continue'] = 1
response = self.client.post(self.get_add_url(), data=post_data) response = self.client.post(self.get_add_url(), data=post_data)
self.assertEqual(response.status_code, 302) self.assertRedirects(response, self.get_change_url(User.objects.get(username='dummy2').pk))
self.assertURLEqual(
response.url,
self.get_change_url(User.objects.get(username='dummy2').pk)
)
post_data.pop('_continue') post_data.pop('_continue')
# Test redirect on "Save and add new". # Test redirect on "Save and add new".
post_data['username'] = 'dummy3' post_data['username'] = 'dummy3'
post_data['_addanother'] = 1 post_data['_addanother'] = 1
response = self.client.post(self.get_add_url(), data=post_data) response = self.client.post(self.get_add_url(), data=post_data)
self.assertEqual(response.status_code, 302) self.assertRedirects(response, self.get_add_url())
self.assertURLEqual(
response.url,
self.get_add_url()
)
post_data.pop('_addanother') post_data.pop('_addanother')
def test_delete_view(self): def test_delete_view(self):
# Test redirect on "Delete". # Test redirect on "Delete".
response = self.client.post(self.get_delete_url(), {'post': 'yes'}) response = self.client.post(self.get_delete_url(), {'post': 'yes'})
self.assertEqual(response.status_code, 302) self.assertRedirects(response, self.get_changelist_url())
self.assertURLEqual(
response.url,
self.get_changelist_url()
)
def test_url_prefix(self): def test_url_prefix(self):
context = { context = {

3
tests/auth_tests/test_views.py
View File

@ -709,8 +709,7 @@ class LoginURLSettings(AuthViewsTestCase):
"""Tests for settings.LOGIN_URL.""" """Tests for settings.LOGIN_URL."""
def assertLoginURLEquals(self, url): def assertLoginURLEquals(self, url):
response = self.client.get('/login_required/') response = self.client.get('/login_required/')
self.assertEqual(response.status_code, 302) self.assertRedirects(response, url, fetch_redirect_response=False)
self.assertURLEqual(response.url, url)
@override_settings(LOGIN_URL='/login/') @override_settings(LOGIN_URL='/login/')
def test_standard_login_url(self): def test_standard_login_url(self):