From 015f7c126d973175edf6e6d18bd277e152be01ac Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 17 Jun 2014 17:49:52 +0100 Subject: [PATCH] Removed assertURLEqual, replaced with Djangos built in assertRedirects --- wagtail/tests/utils.py | 18 ----------- .../tests/test_account_management.py | 23 +++++-------- .../wagtailadmin/tests/test_pages_views.py | 32 +++++++------------ wagtail/wagtailimages/tests.py | 9 ++---- wagtail/wagtailredirects/tests.py | 9 ++---- wagtail/wagtailsnippets/tests.py | 9 ++---- wagtail/wagtailusers/tests.py | 6 ++-- 7 files changed, 30 insertions(+), 76 deletions(-) diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py index 0b13e5932..02327799b 100644 --- a/wagtail/tests/utils.py +++ b/wagtail/tests/utils.py @@ -24,21 +24,3 @@ class WagtailTestUtils(object): self.client.login(username='test', password='password') return user - - # From: https://github.com/django/django/blob/255449c1ee61c14778658caae8c430fa4d76afd6/django/contrib/auth/tests/test_views.py#L70-L85 - def assertURLEqual(self, url, expected, parse_qs=False): - """ - Given two URLs, make sure all their components (the ones given by - urlparse) are equal, only comparing components that are present in both - URLs. - If `parse_qs` is True, then the querystrings are parsed with QueryDict. - This is useful if you don't want the order of parameters to matter. - Otherwise, the query strings are compared as-is. - """ - fields = ParseResult._fields - - for attr, x, y in zip(fields, urlparse(url), urlparse(expected)): - if parse_qs and attr == 'query': - x, y = QueryDict(x), QueryDict(y) - if x and y and x != y: - self.fail("%r != %r (%s doesn't match)" % (url, expected, attr)) diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py index 3553b8fba..566d68723 100644 --- a/wagtail/wagtailadmin/tests/test_account_management.py +++ b/wagtail/wagtailadmin/tests/test_account_management.py @@ -43,8 +43,7 @@ class TestAuthentication(TestCase, WagtailTestUtils): response = self.client.post(reverse('wagtailadmin_login'), post_data) # Check that the user was redirected to the dashboard - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_home')) + self.assertRedirects(response, reverse('wagtailadmin_home')) # Check that the user was logged in self.assertTrue('_auth_user_id' in self.client.session) @@ -60,8 +59,7 @@ class TestAuthentication(TestCase, WagtailTestUtils): response = self.client.get(reverse('wagtailadmin_login')) # Check that the user was redirected to the dashboard - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_home')) + self.assertRedirects(response, reverse('wagtailadmin_home')) def test_logout(self): """ @@ -71,8 +69,7 @@ class TestAuthentication(TestCase, WagtailTestUtils): response = self.client.get(reverse('wagtailadmin_logout')) # Check that the user was redirected to the login page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_login')) + self.assertRedirects(response, reverse('wagtailadmin_login')) # Check that the user was logged out self.assertFalse('_auth_user_id' in self.client.session) @@ -89,8 +86,7 @@ class TestAuthentication(TestCase, WagtailTestUtils): response = self.client.get(reverse('wagtailadmin_home')) # Check that the user was redirected to the login page and that next was set correctly - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_login') + '?next=' + reverse('wagtailadmin_home')) + self.assertRedirects(response, reverse('wagtailadmin_login') + '?next=' + reverse('wagtailadmin_home')) def test_not_logged_in_redirect_default_settings(self): """ @@ -109,7 +105,7 @@ class TestAuthentication(TestCase, WagtailTestUtils): # Note: The user will be redirected to 'django.contrib.auth.views.login' but # this must be the same URL as 'wagtailadmin_login' self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_login') + '?next=' + reverse('wagtailadmin_home')) + self.assertRedirects(response, reverse('wagtailadmin_login') + '?next=' + reverse('wagtailadmin_home')) class TestAccountSection(TestCase, WagtailTestUtils): @@ -154,8 +150,7 @@ class TestAccountSection(TestCase, WagtailTestUtils): response = self.client.post(reverse('wagtailadmin_account_change_password'), post_data) # Check that the user was redirected to the account page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_account')) + self.assertRedirects(response, reverse('wagtailadmin_account')) # Check that the password was changed self.assertTrue(User.objects.get(username='test').check_password('newpassword')) @@ -214,8 +209,7 @@ class TestPasswordReset(TestCase, WagtailTestUtils): response = self.client.post(reverse('password_reset'), post_data) # Check that the user was redirected to the done page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('password_reset_done')) + self.assertRedirects(response, reverse('password_reset_done')) # Check that a password reset email was sent to the user self.assertEqual(len(mail.outbox), 1) @@ -306,8 +300,7 @@ class TestPasswordReset(TestCase, WagtailTestUtils): response = self.client.post(reverse('password_reset_confirm', kwargs=self.url_kwargs), post_data) # Check that the user was redirected to the complete page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('password_reset_complete')) + self.assertRedirects(response, reverse('password_reset_complete')) # Check that the password was changed self.assertTrue(User.objects.get(username='test').check_password('newpassword')) diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index de5415d73..3da08de13 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -159,8 +159,7 @@ class TestPageCreation(TestCase, WagtailTestUtils): response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) # Should be redirected to explorer page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) + self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) # Find the page and check it page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific @@ -178,8 +177,7 @@ class TestPageCreation(TestCase, WagtailTestUtils): response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) # Should be redirected to explorer page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) + self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) # Find the page and check it page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific @@ -201,8 +199,7 @@ class TestPageCreation(TestCase, WagtailTestUtils): response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) # Should be redirected to explorer page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) + self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) # Find the page and check it page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific @@ -317,8 +314,7 @@ class TestPageEdit(TestCase, WagtailTestUtils): response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) # Should be redirected to explorer page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) + self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) # The page should have "has_unpublished_changes" flag set child_page_new = SimplePage.objects.get(id=self.child_page.id) @@ -335,8 +331,7 @@ class TestPageEdit(TestCase, WagtailTestUtils): response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) # Should be redirected to explorer page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) + self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) # Check that the page was edited child_page_new = SimplePage.objects.get(id=self.child_page.id) @@ -359,8 +354,7 @@ class TestPageEdit(TestCase, WagtailTestUtils): response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) # Should be redirected to explorer page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) + self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) # The page should have "has_unpublished_changes" flag set child_page_new = SimplePage.objects.get(id=self.child_page.id) @@ -449,8 +443,7 @@ class TestPageDelete(TestCase, WagtailTestUtils): response = self.client.post(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )), post_data) # Should be redirected to explorer page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) + self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) # Check that the page is gone self.assertEqual(Page.objects.filter(path__startswith=self.root_page.path, slug='hello-world').count(), 0) @@ -609,9 +602,8 @@ class TestPageUnpublish(TestCase, WagtailTestUtils): 'foo': "Must post something or the view won't see this as a POST request", }) - # Check that the user was redirected to the explore page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) + # Should be redirected to explorer page + self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, ))) # Check that the page was unpublished self.assertFalse(SimplePage.objects.get(id=self.page.id).live) @@ -649,8 +641,7 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils): }) # Check that the user was redirected to the dashboard - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_home')) + self.assertRedirects(response, reverse('wagtailadmin_home')) # Page must be live self.assertTrue(Page.objects.get(id=self.page.id).live) @@ -701,8 +692,7 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils): }) # Check that the user was redirected to the dashboard - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailadmin_home')) + self.assertRedirects(response, reverse('wagtailadmin_home')) # Page must not be live self.assertFalse(Page.objects.get(id=self.page.id).live) diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py index b31e33745..4604a94ef 100644 --- a/wagtail/wagtailimages/tests.py +++ b/wagtail/wagtailimages/tests.py @@ -253,8 +253,7 @@ class TestImageAddView(TestCase, WagtailTestUtils): }) # Should redirect back to index - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailimages_index')) + self.assertRedirects(response, reverse('wagtailimages_index')) # Check that the image was created images = Image.objects.filter(title="Test image") @@ -293,8 +292,7 @@ class TestImageEditView(TestCase, WagtailTestUtils): }) # Should redirect back to index - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailimages_index')) + self.assertRedirects(response, reverse('wagtailimages_index')) # Check that the image was edited image = Image.objects.get(id=self.image.id) @@ -328,8 +326,7 @@ class TestImageDeleteView(TestCase, WagtailTestUtils): }) # Should redirect back to index - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailimages_index')) + self.assertRedirects(response, reverse('wagtailimages_index')) # Check that the image was deleted images = Image.objects.filter(title="Test image") diff --git a/wagtail/wagtailredirects/tests.py b/wagtail/wagtailredirects/tests.py index 29ad7ec0b..9aab1e98a 100644 --- a/wagtail/wagtailredirects/tests.py +++ b/wagtail/wagtailredirects/tests.py @@ -113,8 +113,7 @@ class TestRedirectsAddView(TestCase, WagtailTestUtils): }) # Should redirect back to index - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailredirects_index')) + self.assertRedirects(response, reverse('wagtailredirects_index')) # Check that the redirect was created redirects = models.Redirect.objects.filter(old_path='/test') @@ -163,8 +162,7 @@ class TestRedirectsEditView(TestCase, WagtailTestUtils): }) # Should redirect back to index - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailredirects_index')) + self.assertRedirects(response, reverse('wagtailredirects_index')) # Check that the redirect was edited redirects = models.Redirect.objects.filter(old_path='/test') @@ -210,8 +208,7 @@ class TestRedirectsDeleteView(TestCase, WagtailTestUtils): }) # Should redirect back to index - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailredirects_index')) + self.assertRedirects(response, reverse('wagtailredirects_index')) # Check that the redirect was deleted redirects = models.Redirect.objects.filter(old_path='/test') diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py index 9e2587794..1b1e012de 100644 --- a/wagtail/wagtailsnippets/tests.py +++ b/wagtail/wagtailsnippets/tests.py @@ -70,8 +70,7 @@ class TestSnippetCreateView(TestCase, WagtailTestUtils): def test_create(self): response = self.post(post_data={'text': 'test_advert', 'url': 'http://www.example.com/'}) - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailsnippets_list', args=('tests', 'advert'))) + self.assertRedirects(response, reverse('wagtailsnippets_list', args=('tests', 'advert'))) snippets = Advert.objects.filter(text='test_advert') self.assertEqual(snippets.count(), 1) @@ -120,8 +119,7 @@ class TestSnippetEditView(TestCase, WagtailTestUtils): def test_edit(self): response = self.post(post_data={'text': 'edited_test_advert', 'url': 'http://www.example.com/edited'}) - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailsnippets_list', args=('tests', 'advert'))) + self.assertRedirects(response, reverse('wagtailsnippets_list', args=('tests', 'advert'))) snippets = Advert.objects.filter(text='edited_test_advert') self.assertEqual(snippets.count(), 1) @@ -146,8 +144,7 @@ class TestSnippetDelete(TestCase, WagtailTestUtils): response = self.client.post(reverse('wagtailsnippets_delete', args=('tests', 'advert', self.test_snippet.id, )), post_data) # Should be redirected to explorer page - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailsnippets_list', args=('tests', 'advert'))) + self.assertRedirects(response, reverse('wagtailsnippets_list', args=('tests', 'advert'))) # Check that the page is gone self.assertEqual(Advert.objects.filter(text='test_advert').count(), 0) diff --git a/wagtail/wagtailusers/tests.py b/wagtail/wagtailusers/tests.py index 6de97f202..a360fe468 100644 --- a/wagtail/wagtailusers/tests.py +++ b/wagtail/wagtailusers/tests.py @@ -54,8 +54,7 @@ class TestUserCreateView(TestCase, WagtailTestUtils): }) # Should redirect back to index - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailusers_index')) + self.assertRedirects(response, reverse('wagtailusers_index')) # Check that the user was created users = User.objects.filter(username='testuser') @@ -96,8 +95,7 @@ class TestUserEditView(TestCase, WagtailTestUtils): }) # Should redirect back to index - self.assertEqual(response.status_code, 302) - self.assertURLEqual(response.url, reverse('wagtailusers_index')) + self.assertRedirects(response, reverse('wagtailusers_index')) # Check that the user was edited user = User.objects.get(id=self.test_user.id)