Added URL assertions to tests which test redirecting

wagtail/wagtailimages/tests.py

@@ -4,7 +4,7 @@ from django.contrib.auth.models import User, Group, Permission
 from django.core.urlresolvers import reverse
 from django.core.files.uploadedfile import SimpleUploadedFile
 
-from wagtail.tests.utils import login, unittest
+from wagtail.tests.utils import login, unittest, WagtailTestUtils
 from wagtail.wagtailimages.models import get_image_model
 from wagtail.wagtailimages.templatetags import image_tags
 
@@ -217,7 +217,7 @@ class TestImageIndexView(TestCase):
             self.assertEqual(response.status_code, 200)
 
 
-class TestImageAddView(TestCase):
+class TestImageAddView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -240,6 +240,7 @@ class TestImageAddView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailimages_index'))
 
         # Check that the image was created
         images = Image.objects.filter(title="Test image")
@@ -251,7 +252,7 @@ class TestImageAddView(TestCase):
         self.assertEqual(image.height, 480)
 
 
-class TestImageEditView(TestCase):
+class TestImageEditView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -279,13 +280,14 @@ class TestImageEditView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailimages_index'))
 
         # Check that the image was edited
         image = Image.objects.get(id=self.image.id)
         self.assertEqual(image.title, "Edited")
 
 
-class TestImageDeleteView(TestCase):
+class TestImageDeleteView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -313,6 +315,7 @@ class TestImageDeleteView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailimages_index'))
 
         # Check that the image was deleted
         images = Image.objects.filter(title="Test image")

wagtail/wagtailredirects/tests.py

@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.test.client import Client
 from wagtail.wagtailredirects import models
-from wagtail.tests.utils import login
+from wagtail.tests.utils import login, WagtailTestUtils
 from django.core.urlresolvers import reverse
 
 
@@ -90,7 +90,7 @@ class TestRedirectsIndexView(TestCase):
             self.assertEqual(response.status_code, 200)
 
 
-class TestRedirectsAddView(TestCase):
+class TestRedirectsAddView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -114,6 +114,7 @@ class TestRedirectsAddView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailredirects_index'))
 
         # Check that the redirect was created
         redirects = models.Redirect.objects.filter(old_path='/test')
@@ -131,7 +132,7 @@ class TestRedirectsAddView(TestCase):
         self.assertEqual(response.status_code, 200)
 
 
-class TestRedirectsEditView(TestCase):
+class TestRedirectsEditView(TestCase, WagtailTestUtils):
     def setUp(self):
         # Create a redirect to edit
         self.redirect = models.Redirect(old_path='/test', redirect_link='http://www.test.com/')
@@ -163,6 +164,7 @@ class TestRedirectsEditView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailredirects_index'))
 
         # Check that the redirect was edited
         redirects = models.Redirect.objects.filter(old_path='/test')
@@ -179,7 +181,7 @@ class TestRedirectsEditView(TestCase):
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
 
-class TestRedirectsDeleteView(TestCase):
+class TestRedirectsDeleteView(TestCase, WagtailTestUtils):
     def setUp(self):
         # Create a redirect to edit
         self.redirect = models.Redirect(old_path='/test', redirect_link='http://www.test.com/')
@@ -209,6 +211,7 @@ class TestRedirectsDeleteView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailredirects_index'))
 
         # Check that the redirect was deleted
         redirects = models.Redirect.objects.filter(old_path='/test')

wagtail/wagtailsnippets/tests.py

@@ -2,7 +2,7 @@ from django.test import TestCase
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 
-from wagtail.tests.utils import login, unittest
+from wagtail.tests.utils import login, unittest, WagtailTestUtils
 from wagtail.tests.models import Advert
 
 
@@ -40,7 +40,7 @@ class TestSnippetListView(TestCase):
         self.assertContains(self.get(), "Add advert")
 
 
-class TestSnippetCreateView(TestCase):
+class TestSnippetCreateView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -68,13 +68,14 @@ class TestSnippetCreateView(TestCase):
         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')))
 
         snippets = Advert.objects.filter(text='test_advert')
         self.assertEqual(snippets.count(), 1)
         self.assertEqual(snippets.first().url, 'http://www.example.com/')
 
 
-class TestSnippetEditView(TestCase):
+class TestSnippetEditView(TestCase, WagtailTestUtils):
     def setUp(self):
         self.test_snippet = Advert()
         self.test_snippet.text = 'test_advert'
@@ -117,13 +118,14 @@ class TestSnippetEditView(TestCase):
         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')))
 
         snippets = Advert.objects.filter(text='edited_test_advert')
         self.assertEqual(snippets.count(), 1)
         self.assertEqual(snippets.first().url, 'http://www.example.com/edited')
 
 
-class TestSnippetDelete(TestCase):
+class TestSnippetDelete(TestCase, WagtailTestUtils):
     def setUp(self):
         self.test_snippet = Advert()
         self.test_snippet.text = 'test_advert'
@@ -142,6 +144,7 @@ class TestSnippetDelete(TestCase):
 
         # Should be redirected to explorer page
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailsnippets_list', args=('tests', 'advert')))
 
         # Check that the page is gone
         self.assertEqual(Advert.objects.filter(text='test_advert').count(), 0)

wagtail/wagtailusers/tests.py

@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
-from wagtail.tests.utils import login
+from wagtail.tests.utils import login, WagtailTestUtils
 
 
 class TestUserIndexView(TestCase):
@@ -28,7 +28,7 @@ class TestUserIndexView(TestCase):
             self.assertEqual(response.status_code, 200)
 
 
-class TestUserCreateView(TestCase):
+class TestUserCreateView(TestCase, WagtailTestUtils):
     def setUp(self):
         login(self.client)
 
@@ -55,6 +55,7 @@ class TestUserCreateView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailusers_index'))
 
         # Check that the user was created
         users = User.objects.filter(username='testuser')
@@ -62,7 +63,7 @@ class TestUserCreateView(TestCase):
         self.assertEqual(users.first().email, 'test@user.com')
 
 
-class TestUserEditView(TestCase):
+class TestUserEditView(TestCase, WagtailTestUtils):
     def setUp(self):
         # Create a user to edit
         self.test_user = User.objects.create_user(username='testuser', email='testuser@email.com', password='password')
@@ -96,6 +97,7 @@ class TestUserEditView(TestCase):
 
         # Should redirect back to index
         self.assertEqual(response.status_code, 302)
+        self.assertURLEqual(response.url, reverse('wagtailusers_index'))
 
         # Check that the user was edited
         user = User.objects.get(id=self.test_user.id)